From: Alan Mackenzie <acm@muc.de>
To: "João Távora" <joaotavora@gmail.com>
Cc: emacs-devel <emacs-devel@gnu.org>
Subject: [PATCH] Re: Algorithm in electric-pair--unbalanced-strings-p unsuitable for CC Mode
Date: Thu, 4 Jul 2019 16:58:46 +0000 [thread overview]
Message-ID: <20190704165846.GF5564@ACM> (raw)
In-Reply-To: <CALDnm53CKjas-HHy_S_H+_J4CNPxc8pV_30t3isig4vkP0SE+g@mail.gmail.com>
Hello, Joãa.
On Wed, Jul 03, 2019 at 14:31:58 +0100, João Távora wrote:
[ .... ]
> If [you] don't agree, find a small enough solution that fixes e-p-m,
> propose it here, then find a consensus that overrides my opinion, it
> happens all the time, won't hold it against you or anyone else, good
> luck.
Here is the entire part of the fix needed for bug #36474, that should go
into elec-pair-mode.el:
diff --git a/lisp/elec-pair.el b/lisp/elec-pair.el
index 5fb9d751e2..ba86b55167 100644
--- a/lisp/elec-pair.el
+++ b/lisp/elec-pair.el
@@ -484,6 +484,23 @@ electric-pair-default-inhibit
(electric-pair-inhibit-if-helps-balance char)
(electric-pair-conservative-inhibit char)))
+(defun electric-pair-cc-inhibit-predicate (char)
+ "Return t to inhibit the insertion of a second copy of CHAR.
+
+At the time of call, point is just after the newly inserted CHAR.
+
+When CHAR is \", t will be returned unless the \" is marked with
+a string fence syntax-table text property. For other characters
+`electric-pair-default-inhibit' is called and its value returned.
+
+This function is the appropriate value of
+`electric-pair-inhibit-predicate' for CC Mode modes, which mark
+invalid strings with such a syntax table text property on the
+opening \" and the next unescaped end of line."
+ (if (eq char ?\")
+ (not (equal (get-text-property (1- (point)) 'syntax-table) '(15)))
+ (electric-pair-default-inhibit char)))
+
(defun electric-pair-post-self-insert-function ()
(let* ((pos (and electric-pair-mode (electric--after-char-pos)))
(skip-whitespace-info))
You will note that it is the mere addition of a function, not used
anywhere else in elec-pair.el, so cannot possibly damage its
functionality. If I was being perverse, I could even put this function
in cc-mode.el instead, though this would not be good practice.
This new function has been tested, and it works.
Now, will you please just decide to install this patch. If you like, I
can write a commit message for it.
> --
> João Távora
--
Alan Mackenzie (Nuremberg, Germany).
next prev parent reply other threads:[~2019-07-04 16:58 UTC|newest]
Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20190702131632.GA30597@ACM>
[not found] ` <CALDnm51Hi10KMqYneWBamNL4sNdzHEz6_NasGk=oR_y-=1Y7nQ@mail.gmail.com>
2019-07-02 15:27 ` Fwd: Algorithm in electric-pair--unbalanced-strings-p unsuitable for CC Mode João Távora
[not found] ` <20190702160410.GB30597@ACM>
2019-07-02 17:22 ` João Távora
2019-07-02 18:28 ` bug#36474: " Alan Mackenzie
2019-07-02 21:11 ` Stefan Monnier
2019-07-03 9:28 ` João Távora
2019-07-03 10:58 ` Alan Mackenzie
2019-07-03 13:07 ` Dmitry Gutov
2019-07-03 13:32 ` Alan Mackenzie
2019-07-03 14:25 ` Dmitry Gutov
2019-07-03 15:58 ` Eli Zaretskii
2019-07-03 20:54 ` Alan Mackenzie
2019-07-04 2:33 ` Eli Zaretskii
2019-07-04 1:36 ` Richard Stallman
2019-07-03 13:33 ` Eli Zaretskii
2019-07-03 13:35 ` João Távora
2019-07-03 13:31 ` João Távora
2019-07-03 18:25 ` Kévin Le Gouguec
2019-07-04 0:52 ` João Távora
2019-07-04 6:17 ` Kévin Le Gouguec
2019-07-04 15:05 ` Alan Mackenzie
2019-07-04 15:50 ` João Távora
2019-07-04 16:58 ` Alan Mackenzie [this message]
2019-07-04 18:45 ` [PATCH] " João Távora
2019-07-04 19:01 ` Alan Mackenzie
2019-07-04 21:44 ` João Távora
2019-07-08 10:05 ` Alan Mackenzie
2019-07-08 12:10 ` João Távora
2019-07-08 15:49 ` Stefan Monnier
2019-07-08 16:33 ` Stefan Monnier
2019-07-08 17:24 ` Alan Mackenzie
2019-07-08 17:32 ` Stefan Monnier
2019-07-08 16:45 ` Alan Mackenzie
2019-07-08 17:29 ` Stefan Monnier
2019-07-08 18:05 ` Alan Mackenzie
2019-07-08 20:59 ` Stefan Monnier
2019-07-09 6:41 ` Clément Pit-Claudel
2019-07-09 9:06 ` João Távora
2019-07-09 9:23 ` João Távora
2019-07-09 9:52 ` Alan Mackenzie
2019-07-09 10:54 ` João Távora
2019-07-09 11:18 ` João Távora
2019-07-09 15:18 ` Dmitry Gutov
2019-07-09 15:40 ` contextual refontification (was: [PATCH] Re: Algorithm in electric-pair--unbalanced-strings-p unsuitable for CC Mode) Stefan Monnier
2019-07-10 9:32 ` João Távora
2019-07-09 15:43 ` [PATCH] Re: Algorithm in electric-pair--unbalanced-strings-p unsuitable for CC Mode João Távora
2019-07-09 15:31 ` Alan Mackenzie
2019-07-09 16:14 ` João Távora
2019-07-09 12:33 ` Clément Pit-Claudel
2019-07-09 14:28 ` João Távora
2019-07-09 16:05 ` Clément Pit-Claudel
2019-07-09 16:32 ` João Távora
2019-07-09 17:09 ` João Távora
2019-07-09 13:45 ` Stefan Monnier
2019-07-09 16:00 ` Alan Mackenzie
2019-07-09 17:11 ` Stefan Monnier
2019-07-09 18:26 ` Alan Mackenzie
2019-07-09 18:47 ` Eli Zaretskii
2019-07-09 18:53 ` João Távora
2019-07-10 10:32 ` Alan Mackenzie
2019-07-10 10:40 ` Lars Ingebrigtsen
2019-07-10 12:24 ` João Távora
2019-07-10 14:14 ` Clément Pit-Claudel
2019-07-10 16:07 ` João Távora
2019-07-11 15:14 ` Lars Ingebrigtsen
2019-07-11 15:43 ` João Távora
2019-07-11 15:51 ` Lars Ingebrigtsen
2019-07-11 16:13 ` João Távora
2019-07-12 15:58 ` Lars Ingebrigtsen
2019-07-12 18:47 ` João Távora
2019-07-13 0:08 ` Lars Ingebrigtsen
2019-07-10 12:10 ` João Távora
2019-07-10 14:03 ` Alan Mackenzie
2019-07-10 16:05 ` João Távora
2019-07-10 17:56 ` Alan Mackenzie
2019-07-11 0:11 ` Richard Stallman
2019-07-03 16:56 ` Stefan Monnier
2019-07-03 16:58 ` Stefan Monnier
2019-07-04 15:24 ` Alan Mackenzie
2019-07-04 15:52 ` Stefan Monnier
2019-07-04 16:42 ` Alan Mackenzie
2019-07-04 20:16 ` Stefan Monnier
2019-07-04 21:27 ` João Távora
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190704165846.GF5564@ACM \
--to=acm@muc.de \
--cc=emacs-devel@gnu.org \
--cc=joaotavora@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).