From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: [Emacs-diffs] master 682ab5d 2/2: Adjust previous electric.el and elec-pair.el change Date: Fri, 25 Jan 2019 15:01:33 -0500 Message-ID: References: <20190125173320.19662.38664@vcs0.savannah.gnu.org> <20190125173321.6DA962099D@vcs0.savannah.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="135685"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) Cc: =?windows-1252?B?Sm/jbyBU4XZvcmE=?= To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jan 25 21:02:48 2019 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1gn7gc-000Z5r-9n for ged-emacs-devel@m.gmane.org; Fri, 25 Jan 2019 21:02:46 +0100 Original-Received: from localhost ([127.0.0.1]:50052 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gn7gb-0001xz-7Z for ged-emacs-devel@m.gmane.org; Fri, 25 Jan 2019 15:02:45 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:44093) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gn7fY-0001wA-91 for emacs-devel@gnu.org; Fri, 25 Jan 2019 15:01:41 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gn7fW-0005zg-3J for emacs-devel@gnu.org; Fri, 25 Jan 2019 15:01:40 -0500 Original-Received: from chene.dit.umontreal.ca ([132.204.246.20]:36303) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gn7fV-0005yl-7I for emacs-devel@gnu.org; Fri, 25 Jan 2019 15:01:38 -0500 Original-Received: from ceviche.home (lechon.iro.umontreal.ca [132.204.27.242]) by chene.dit.umontreal.ca (8.14.7/8.14.1) with ESMTP id x0PK1Xpi012148; Fri, 25 Jan 2019 15:01:34 -0500 Original-Received: by ceviche.home (Postfix, from userid 20848) id B9F34661CF; Fri, 25 Jan 2019 15:01:33 -0500 (EST) In-Reply-To: <20190125173321.6DA962099D@vcs0.savannah.gnu.org> (=?windows-1252?Q?=22Jo=E3o=09T=E1vora=22's?= message of "Fri, 25 Jan 2019 12:33:21 -0500 (EST)") X-NAI-Spam-Flag: NO X-NAI-Spam-Threshold: 5 X-NAI-Spam-Score: 0.2 X-NAI-Spam-Rules: 3 Rules triggered ATR_WMN=0.2, EDT_SA_DN_PASS=0, RV6469=0 X-NAI-Spam-Version: 2.3.0.9418 : core <6469> : inlines <7002> : streams <1811134> : uri <2785525> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 132.204.246.20 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:232683 Archived-At: > This fixes a serious bug introduced previously > electric-pair-inhibit-if-helps-balance and > electric-pair-skip-if-helps-balance, whereby "innocent" markers were > being pushed by those function's new save-change-and-restore > semantics. The fix can probably still be improved. Could you add corresponding test cases? > + ;; FIXME: need this instead of `save-excursion' when functions in > + ;; BODY, such as `electric-pair-inhibit-if-helps-balance' and > + ;; `electric-pair-skip-if-helps-balance' modify and restore the > + ;; buffer in a way that modifies the marker used by save-excursion. Then maybe a better approach is to use `undo`, as in the 100% untested (and guaranteed incomplete) patch below, Stefan diff --git a/lisp/elec-pair.el b/lisp/elec-pair.el index b5ec492930..3be09d87b4 100644 --- a/lisp/elec-pair.el +++ b/lisp/elec-pair.el @@ -429,20 +429,25 @@ electric-pair-inhibit-if-helps-balance happened." (pcase (electric-pair-syntax-info char) (`(,syntax ,pair ,_ ,s-or-c) - (unwind-protect - (progn - (delete-char -1) - (cond ((eq ?\( syntax) - (let* ((pair-data - (electric-pair--balance-info 1 s-or-c)) - (outermost (cdr pair-data))) - (cond ((car outermost) - nil) - (t - (eq (cdr outermost) pair))))) - ((eq syntax ?\") - (electric-pair--unbalanced-strings-p char)))) - (insert char))))) + (catch 'done + ;; FIXME: modify+undo is *very* tricky business. We used to + ;; use `delete-char' followed by `insert', but this changed the + ;; position of some markers. The real fix would be to compute the + ;; result without having to modify the buffer at all. + (atomic-change-group + (delete-char -1) + (throw + 'done + (cond ((eq ?\( syntax) + (let* ((pair-data + (electric-pair--balance-info 1 s-or-c)) + (outermost (cdr pair-data))) + (cond ((car outermost) + nil) + (t + (eq (cdr outermost) pair))))) + ((eq syntax ?\") + (electric-pair--unbalanced-strings-p char))))))))) (defun electric-pair-skip-if-helps-balance (char) "Return non-nil if skipping CHAR would benefit parentheses' balance.