From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eshel Yaron via "Bug reports for GNU Emacs, the Swiss army knife of text editors" Newsgroups: gmane.emacs.bugs Subject: bug#72437: Unexpected behavior when inserting with prefix arg in electric-pair-mode Date: Sat, 03 Aug 2024 13:04:58 +0200 Message-ID: References: <87le1edqqm.fsf@breatheoutbreathe.in> <86h6c2ug0p.fsf@gnu.org> Reply-To: Eshel Yaron Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="27447"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: 72437@debbugs.gnu.org, Stefan Monnier , Joseph Turner To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sat Aug 03 13:06:09 2024 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1saCaP-00070E-6e for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 03 Aug 2024 13:06:09 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1saCa8-0008FF-UE; Sat, 03 Aug 2024 07:05:52 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1saCZz-0008ES-0n for bug-gnu-emacs@gnu.org; Sat, 03 Aug 2024 07:05:45 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1saCZy-0006nr-Jp for bug-gnu-emacs@gnu.org; Sat, 03 Aug 2024 07:05:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:References:In-Reply-To:From:To:Subject; bh=oEpcE+NgacWCpHJAKm+2Dtcmbsi2bKGLh3aUVy5Zfc8=; b=SPp7bKB9XuYQr53f07IWhe9mG/9SY3ao0cq6YUZ52lS+u/J9yvmqJIlS/DZYV2I08XtIwT4aG4eXiZGhYbFeonfHxdY4KiNoTCWyRBr2sMQxhXlT52IXy3BRMfZ/T4Bt+wrQRstnJCjp/w7+GpYORiSO3s2aalkJ5scI0t+Ot+4lPy7EmBd41QQDQsE7J2LXPSQj/X4nBVqpS2I9WeRqkZ8Cn+DRINGHybQOLDDHGACkkQHygnvYFNo92yWVzcraDB+eSuFV663IRIWXG3Kdc96ykWO7iCKE2Glzdwo2pzlpMJq2hFdhinaGt/1T9O1tv6L6tSzD73QDAkh6oyw4DQ==; Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1saCaH-0001L8-VZ for bug-gnu-emacs@gnu.org; Sat, 03 Aug 2024 07:06:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Eshel Yaron Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 03 Aug 2024 11:06:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72437 X-GNU-PR-Package: emacs Original-Received: via spool by 72437-submit@debbugs.gnu.org id=B72437.17226831265086 (code B ref 72437); Sat, 03 Aug 2024 11:06:01 +0000 Original-Received: (at 72437) by debbugs.gnu.org; 3 Aug 2024 11:05:26 +0000 Original-Received: from localhost ([127.0.0.1]:54123 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1saCZh-0001Jx-A1 for submit@debbugs.gnu.org; Sat, 03 Aug 2024 07:05:25 -0400 Original-Received: from mail.eshelyaron.com ([107.175.124.16]:40784 helo=eshelyaron.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1saCZd-0001Jo-Ng for 72437@debbugs.gnu.org; Sat, 03 Aug 2024 07:05:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=eshelyaron.com; s=mail; t=1722683101; bh=GBoOm2QGLfYOZDq7ccKxIRUjqXrcGJFKcekUXvifFr4=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=m1T24mT08z6JWk4CjDlETx+3cbE6hUhEQygFpe47MiMrklLXm0wlelvaMVmEFmCQd 2x8Ot7zXm7WdHcm+x1vwiOvJrup1LAHI094MlvebTtuRLI0H/nS8ZGlK//FhKhWilr Qzz0hILFZDEptnrwY9EjiZZ+CjTfb3IUxDs0IirB5w27/PwLHRUturjukss0O51j7z CJmWKsVZM8roBV65cU3FOj0x03IKt5vQUX++lmo+Psv5DaMG/kdSKsH/GH1F28LLCy 1IydnZdXbZF019HCzP1PrIxW2tyxmde8fbuRuq7gkB9Fvy1K4Xfgnrd0s5toV5pb9B VqBu0f0xgGZ5Q== In-Reply-To: <86h6c2ug0p.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 03 Aug 2024 12:12:06 +0300") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:289673 Archived-At: Eli Zaretskii writes: >> Cc: eliz@gnu.org >> From: Joseph Turner >> Date: Sat, 03 Aug 2024 00:12:33 -0700 >> >> Migrated from this thread on the devel mailing list: >> >> https://yhetil.org/emacs-devel/86ikwiumza.fsf@gnu.org/T/#t >> >> >> On Emacs 29.4, with emacs -Q >> >> Turn on electric-pair-mode >> >> (electric-pair-mode +1) >> >> Then press "C-2 (" >> >> Expected result: >> >> Either (()) or ()() >> >> Actual result: >> >> (() >> >> >> I noticed the unexpected behavior when attempting to surround some text >> with multiple braces in order to create Anki flashcards. >> >> More or less, I wanted to go from "foo" to "{{foo}}", and I thought >> perhaps that with the whole word selected, pressing "C-2 {" would DTRT. >> >> In general, I'm not sure whether "{}{}" or "{{}}"is more useful or >> expected, but I suspect both are better than "{{}". > > Making it produce "{}{}" is relatively easy: we just need to call the > post-self-insert-hook for each of the ARG inserted characters. OTOH, > to produce "{{}}" we'd probably need to rewrite the > electric-pair-mode's hook function, but I have no idea how to rewrite > it to do that. > > Stefan, any suggestions? I'm no Stefan, but I took a quick stab at it. The following diff teaches electric-pair-mode about numeric prefix arguments: diff --git a/lisp/elec-pair.el b/lisp/elec-pair.el index 40618e9ef38..1fae0ba6ba4 100644 --- a/lisp/elec-pair.el +++ b/lisp/elec-pair.el @@ -260,7 +260,7 @@ electric-pair-syntax-info (list ?\( (cdr direct) t string-or-comment))) (reverse (list ?\) (car reverse) t string-or-comment))))) -(defun electric-pair--insert (char) +(defun electric-pair--insert (char times) (let ((last-command-event char) (blink-matching-paren nil) (electric-pair-mode nil) @@ -271,7 +271,7 @@ electric-pair--insert ;; us to add these newlines, and is probably about to kick in ;; again after we add the closer. (electric-layout-allow-duplicate-newlines t)) - (self-insert-command 1))) + (self-insert-command times))) (defun electric-pair--syntax-ppss (&optional pos where) "Like `syntax-ppss', but sometimes fallback to `parse-partial-sexp'. @@ -455,7 +455,8 @@ electric-pair-inhibit-if-helps-balance (atomic-change-group ;; Don't use `delete-char'; that may modify the head of the ;; undo list. - (delete-region (point) (1- (point))) + (delete-region (- (point) (prefix-numeric-value current-prefix-arg)) + (point)) (throw 'done (cond ((eq ?\( syntax) @@ -474,25 +475,26 @@ electric-pair-skip-if-helps-balance Works by first removing the character from the buffer, then doing some list calculations, finally restoring the situation as if nothing 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)) - (innermost (car pair-data)) - (outermost (cdr pair-data))) - (and - (cond ((car outermost) - (car innermost)) - ((car innermost) - (not (eq (cdr outermost) pair))))))) - ((eq syntax ?\") - (electric-pair--inside-string-p char)))) - (insert char))))) + (let ((num (prefix-numeric-value current-prefix-arg))) + (pcase (electric-pair-syntax-info char) + (`(,syntax ,pair ,_ ,s-or-c) + (unwind-protect + (progn + (delete-char (- num)) + (cond ((eq syntax ?\)) + (let* ((pair-data + (electric-pair--balance-info + (- num) s-or-c)) + (innermost (car pair-data)) + (outermost (cdr pair-data))) + (and + (cond ((car outermost) + (car innermost)) + ((car innermost) + (not (eq (cdr outermost) pair))))))) + ((eq syntax ?\") + (electric-pair--inside-string-p char)))) + (insert (make-string num char))))))) (defun electric-pair-default-skip-self (char) (if electric-pair-preserve-balance @@ -527,11 +529,14 @@ electric-pair-post-self-insert-function `electric-pair-inhibit-predicate', `electric-pair-skip-self' and `electric-pair-skip-whitespace' (which see)." (let* ((pos (and electric-pair-mode (electric--after-char-pos))) + (num (when pos (prefix-numeric-value current-prefix-arg))) + (beg (when num (- pos num))) (skip-whitespace-info)) (pcase (electric-pair-syntax-info last-command-event) (`(,syntax ,pair ,unconditional ,_) (cond ((null pos) nil) + ((zerop num) nil) ;; Wrap a pair around the active region. ;; ((and (memq syntax '(?\( ?\) ?\" ?\$)) (use-region-p)) @@ -545,23 +550,24 @@ electric-pair-post-self-insert-function (>= (mark) (point)))) (save-excursion (goto-char (mark)) - (electric-pair--insert pair)) - (delete-region pos (1- pos)) - (electric-pair--insert pair) + (electric-pair--insert pair num)) + (delete-region beg pos) + (electric-pair--insert pair num) (goto-char (mark)) - (electric-pair--insert last-command-event))) + (electric-pair--insert last-command-event num))) ;; Backslash-escaped: no pairing, no skipping. ((save-excursion - (goto-char (1- pos)) + (goto-char beg) (not (zerop (% (skip-syntax-backward "\\") 2)))) - nil) + (let ((current-prefix-arg (1- num))) + (electric-pair-post-self-insert-function))) ;; Skip self. ((and (memq syntax '(?\) ?\" ?\$)) (and (or unconditional (if (functionp electric-pair-skip-self) (electric-pair--save-literal-point-excursion - (goto-char pos) - (funcall electric-pair-skip-self last-command-event)) + (goto-char pos) + (funcall electric-pair-skip-self last-command-event)) electric-pair-skip-self)) (save-excursion (when (and (not (and unconditional @@ -580,19 +586,19 @@ electric-pair-post-self-insert-function ;; live with it for now. (when skip-whitespace-info (funcall electric-pair-skip-whitespace-function)) - (delete-region (1- pos) (if (eq skip-whitespace-info 'chomp) - (point) - pos)) - (forward-char)) + (delete-region beg (if (eq skip-whitespace-info 'chomp) + (point) + pos)) + (forward-char num)) ;; Insert matching pair. ((and (memq syntax '(?\( ?\" ?\$)) (not overwrite-mode) (or unconditional (not (electric-pair--save-literal-point-excursion - (goto-char pos) - (funcall electric-pair-inhibit-predicate - last-command-event))))) - (save-excursion (electric-pair--insert pair)))))))) + (goto-char pos) + (funcall electric-pair-inhibit-predicate + last-command-event))))) + (save-excursion (electric-pair--insert pair num)))))))) (defun electric-pair-open-newline-between-pairs-psif () "Honor `electric-pair-open-newline-between-pairs'. @@ -604,7 +610,8 @@ electric-pair-open-newline-between-pairs-psif (< (1+ (point-min)) (point) (point-max)) (eq (save-excursion (skip-chars-backward "\t\s") - (char-before (1- (point)))) + (char-before (- (point) + (prefix-numeric-value current-prefix-arg)))) (matching-paren (char-after)))) (save-excursion (newline 1 t)))) @@ -618,7 +625,7 @@ electric-pair-delete-pair ARG and KILLP are passed directly to `backward-delete-char-untabify', which see." (interactive "*p\nP") - (delete-char 1) + (delete-char arg) (backward-delete-char-untabify arg killp)) (defvar electric-pair-mode-map