From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Andrea Greselin Newsgroups: gmane.emacs.devel Subject: =?UTF-8?Q?Re=3A_Make_=E2=80=98electric=2Dquote=2Dmode=E2=80=99_not_merge_single_?= =?UTF-8?Q?quotes?= Date: Wed, 3 Aug 2022 14:50:54 +0200 Message-ID: References: Mime-Version: 1.0 Content-Type: multipart/alternative; boundary="0000000000002cea6305e555b18d" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="17920"; mail-complaints-to="usenet@ciao.gmane.io" To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Thu Aug 04 07:13:06 2022 Return-path: Envelope-to: ged-emacs-devel@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 1oJTAQ-0004SN-7O for ged-emacs-devel@m.gmane-mx.org; Thu, 04 Aug 2022 07:13:06 +0200 Original-Received: from localhost ([::1]:55940 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oJTAO-000095-U7 for ged-emacs-devel@m.gmane-mx.org; Thu, 04 Aug 2022 01:13:04 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:41622) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oJDqa-0005iK-Ew for emacs-devel@gnu.org; Wed, 03 Aug 2022 08:51:36 -0400 Original-Received: from mail-qv1-xf36.google.com ([2607:f8b0:4864:20::f36]:45643) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oJDqX-0000iq-2Z for emacs-devel@gnu.org; Wed, 03 Aug 2022 08:51:35 -0400 Original-Received: by mail-qv1-xf36.google.com with SMTP id v2so12803257qvs.12 for ; Wed, 03 Aug 2022 05:51:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :from:to:cc; bh=olJUPYwnz5ew0Qx4juXYRTsCVmlPhtBGrW4OutBOjBA=; b=bn3n/DSVOZvb4V4nwPIziixs2Rk+cW89NlM9Z3tv+68aBJ8Pwimhi84846amXa3bfF 6u29vQtY1mgqwZx4Fyt1nPHDN3VFHyZ+uXYLN+YbN8zv72Zytws3KEOxeCqZls4si+Fe blbkfRDZNqeklMWSJ2hfyIw+qXVfDSK9GrXq9Y0Ds5DBHpZRdJGUScURGUi0dcmH6PnT 4oRv376dhOHATQ3k6gBcQBqDrrJMEuekCfoJTj3tdfvFMcXIstpKiVMHzxgWPPek+rwb eEHjJURgBxXXMdApsFkfF1g+RUM98YLQhSIlnBuafw06tZW0zF4NkvTNl+Kn3FoVOGIP qbFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :x-gm-message-state:from:to:cc; bh=olJUPYwnz5ew0Qx4juXYRTsCVmlPhtBGrW4OutBOjBA=; b=71dHl8jZbkvxt9wC/10/DICmqpGY7mgpJXpJyJ405ve3CTPhD78U9sk9SjA6EmTYXS we1Kn+fy3zYBmZgupkwWfiGPzPNpGhYZ/wEw/u96rVR8eMHaUmqx1AcNc+ghj18wyO9x gFrC2srxzm59Luw//coQwEIsI0drbbUmgz4pOw907B4TKZSv0Po9pHi53z/63oL1kjQ7 GoRJDmQ+nHF4FBDkxm8dkt4D8IT24Sz6UFqgp89MMnsPjxMRkRCQ0Ts70hXnYVCp/YAE MWRHx+IRBMTtxWMWZNu7Hogj1WqYH7aEUfwFYoGILRl1si1ENfRn06qNUEJ5pxpRSIJ9 qitQ== X-Gm-Message-State: ACgBeo0L7IqyUXlHidPxAf5wQr3x1mRiLym9janCJEFBtdno2lUP0cWh fDTLHTGpYuDnrP5TDHWjdAWK5ett0qHao8YBMTcSBuIPszw= X-Google-Smtp-Source: AA6agR4rHZ+1Yp2n3Vj4Paoo2yVzsQhPoy4/ravLGwJGE8za7LlT2+RhBl7xc7CHbn2k3RB9b+hfsUakqMlHjO+ZcFQ= X-Received: by 2002:ad4:5de8:0:b0:473:8d62:d2db with SMTP id jn8-20020ad45de8000000b004738d62d2dbmr21041115qvb.112.1659531091043; Wed, 03 Aug 2022 05:51:31 -0700 (PDT) In-Reply-To: Received-SPF: pass client-ip=2607:f8b0:4864:20::f36; envelope-from=greselin.andrea@gmail.com; helo=mail-qv1-xf36.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Thu, 04 Aug 2022 01:10:53 -0400 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 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-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:293039 Archived-At: --0000000000002cea6305e555b18d Content-Type: text/plain; charset="UTF-8" Here's a patch that implements the changes described in my previous message. It defaults to the current behaviour. Andrea --- electric--v28.1.el 2022-08-02 14:41:09.578483586 +0200 +++ electric--modified.el 2022-08-02 14:47:17.712875776 +0200 @@ -534,6 +534,11 @@ :version "26.1" :type 'boolean :safe #'booleanp :group 'electricity) +(defcustom electric-quote-replace-consecutive t + "Non-nil means to replace two consecutive electric single quotes +with the corresponding (opening or closing) double quote." + :type 'boolean :safe #'booleanp :group 'electricity) + (defvar electric-quote-inhibit-functions () "List of functions that should inhibit electric quoting. When the variable `electric-quote-mode' is non-nil, Emacs will @@ -586,7 +591,8 @@ (memq (char-syntax (char-before)) '(?\s ?\()))) (setq backtick ?\'))) - (cond ((search-backward (string q< backtick) (- (point) 2) t) + (cond ((and electric-quote-replace-consecutive + (search-backward (string q< backtick) (- (point) 2) t)) (replace-match (string q<<)) (when (and electric-pair-mode (eq (cdr-safe @@ -600,7 +606,8 @@ ((search-backward "\"" (1- (point)) t) (replace-match (string q<<)) (setq last-command-event q<<))) - (cond ((search-backward (string q> ?') (- (point) 2) t) + (cond ((and electric-quote-replace-consecutive + (search-backward (string q> ?') (- (point) 2) t)) (replace-match (string q>>)) (setq last-command-event q>>)) ((search-backward "'" (1- (point)) t) --0000000000002cea6305e555b18d Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: base64 PGRpdiBkaXI9Imx0ciI+PGRpdj5IZXJlJiMzOTtzIGEgcGF0Y2ggdGhhdCBpbXBsZW1lbnRzIHRo ZSBjaGFuZ2VzIGRlc2NyaWJlZCBpbiBteSBwcmV2aW91czxicj5tZXNzYWdlLiBJdCBkZWZhdWx0 cyB0byB0aGUgY3VycmVudCBiZWhhdmlvdXIuPGJyPjwvZGl2PjxkaXY+PGJyPjwvZGl2PjxkaXY+ QW5kcmVhPGJyPjwvZGl2PjxkaXY+PGJyPjwvZGl2PjxkaXY+wqAgLS0tIGVsZWN0cmljLS12Mjgu MS5lbAkyMDIyLTA4LTAyIDE0OjQxOjA5LjU3ODQ4MzU4NiArMDIwMDxicj7CoCArKysgZWxlY3Ry aWMtLW1vZGlmaWVkLmVsCTIwMjItMDgtMDIgMTQ6NDc6MTcuNzEyODc1Nzc2ICswMjAwPGJyPsKg IEBAIC01MzQsNiArNTM0LDExIEBAPGJyPsKgIMKgIMKgOnZlcnNpb24gJnF1b3Q7MjYuMSZxdW90 Ozxicj7CoCDCoCDCoDp0eXBlICYjMzk7Ym9vbGVhbiA6c2FmZSAjJiMzOTtib29sZWFucCA6Z3Jv dXAgJiMzOTtlbGVjdHJpY2l0eSk8YnI+wqAgwqA8YnI+wqAgKyhkZWZjdXN0b20gZWxlY3RyaWMt cXVvdGUtcmVwbGFjZS1jb25zZWN1dGl2ZSB0PGJyPsKgICsgwqAmcXVvdDtOb24tbmlsIG1lYW5z IHRvIHJlcGxhY2UgdHdvIGNvbnNlY3V0aXZlIGVsZWN0cmljIHNpbmdsZSBxdW90ZXM8YnI+wqAg K3dpdGggdGhlIGNvcnJlc3BvbmRpbmcgKG9wZW5pbmcgb3IgY2xvc2luZykgZG91YmxlIHF1b3Rl LiZxdW90Ozxicj7CoCArIMKgOnR5cGUgJiMzOTtib29sZWFuIDpzYWZlICMmIzM5O2Jvb2xlYW5w IDpncm91cCAmIzM5O2VsZWN0cmljaXR5KTxicj7CoCArPGJyPsKgIMKgKGRlZnZhciBlbGVjdHJp Yy1xdW90ZS1pbmhpYml0LWZ1bmN0aW9ucyAoKTxicj7CoCDCoCDCoCZxdW90O0xpc3Qgb2YgZnVu Y3Rpb25zIHRoYXQgc2hvdWxkIGluaGliaXQgZWxlY3RyaWMgcXVvdGluZy48YnI+wqAgwqBXaGVu IHRoZSB2YXJpYWJsZSBgZWxlY3RyaWMtcXVvdGUtbW9kZSYjMzk7IGlzIG5vbi1uaWwsIEVtYWNz IHdpbGw8YnI+wqAgQEAgLTU4Niw3ICs1OTEsOCBAQDxicj7CoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoChtZW1xIChjaGFyLXN5bnRheCAoY2hhci1iZWZv cmUpKTxicj7CoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCYjMzk7KD9ccyA/XCgpKSkpPGJyPsKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgKHNldHEgYmFja3RpY2sgP1wmIzM5OykpKTxicj7CoCAtIMKgIMKgIMKg IMKgIMKgIMKgIMKgIChjb25kICgoc2VhcmNoLWJhY2t3YXJkIChzdHJpbmcgcSZsdDsgYmFja3Rp Y2spICgtIChwb2ludCkgMikgdCk8YnI+wqAgKyDCoCDCoCDCoCDCoCDCoCDCoCDCoCAoY29uZCAo KGFuZCBlbGVjdHJpYy1xdW90ZS1yZXBsYWNlLWNvbnNlY3V0aXZlPGJyPsKgICsgwqAgwqAgwqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgKHNlYXJjaC1iYWNrd2FyZCAoc3RyaW5nIHEm bHQ7IGJhY2t0aWNrKSAoLSAocG9pbnQpIDIpIHQpKTxicj7CoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCDCoChyZXBsYWNlLW1hdGNoIChzdHJpbmcgcSZsdDsmbHQ7KSk8YnI+wqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAod2hlbiAoYW5kIGVsZWN0cmljLXBh aXItbW9kZTxicj7CoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoCAoZXEgKGNkci1zYWZlPGJyPsKgIEBAIC02MDAsNyArNjA2LDggQEA8YnI+wqAgwqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgKChzZWFyY2gtYmFja3dhcmQgJnF1b3Q7XCZx dW90OyZxdW90OyAoMS0gKHBvaW50KSkgdCk8YnI+wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqAocmVwbGFjZS1tYXRjaCAoc3RyaW5nIHEmbHQ7Jmx0OykpPGJyPsKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgKHNldHEgbGFzdC1jb21tYW5kLWV2ZW50IHEm bHQ7Jmx0OykpKTxicj7CoCAtIMKgIMKgIMKgIMKgIMKgIMKgIChjb25kICgoc2VhcmNoLWJhY2t3 YXJkIChzdHJpbmcgcSZndDsgPyYjMzk7KSAoLSAocG9pbnQpIDIpIHQpPGJyPsKgICsgwqAgwqAg wqAgwqAgwqAgwqAgKGNvbmQgKChhbmQgZWxlY3RyaWMtcXVvdGUtcmVwbGFjZS1jb25zZWN1dGl2 ZTxicj7CoCArIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIChzZWFyY2gtYmFj a3dhcmQgKHN0cmluZyBxJmd0OyA/JiMzOTspICgtIChwb2ludCkgMikgdCkpPGJyPsKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgKHJlcGxhY2UtbWF0Y2ggKHN0cmluZyBxJmd0OyZn dDspKTxicj7CoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoChzZXRxIGxhc3QtY29t bWFuZC1ldmVudCBxJmd0OyZndDspKTxicj7CoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCAoKHNlYXJjaC1iYWNrd2FyZCAmcXVvdDsmIzM5OyZxdW90OyAoMS0gKHBvaW50KSkgdCk8YnI+ PC9kaXY+PC9kaXY+DQo= --0000000000002cea6305e555b18d--