From: Alan Mackenzie <acm@muc.de>
To: Jim Porter <jporterbugs@gmail.com>
Cc: 50538@debbugs.gnu.org
Subject: bug#50538: [PATCH v3] 28.0.50; electric-pair-mode fails to pair double quotes in some cases in CC mode
Date: Sun, 26 Sep 2021 20:58:36 +0000 [thread overview]
Message-ID: <YVDe/EzCJ+w8HEBZ@ACM> (raw)
In-Reply-To: <543ebfcc-d032-f0cd-f605-3f0607fe1df1@gmail.com>
Hello, Jim.
There's one thing I'm a bit uncertain about in the patch for cc-mode.el.
On Wed, Sep 22, 2021 at 19:01:11 -0700, Jim Porter wrote:
> Ok, I've attached an updated patch that should apply cleanly on top of
> the patches for bug#49518. The tests still pass locally for me. If
> there's anything else that needs fixed/adjusted, just let me know.
[ .... ]
> diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
> index 8b30241449..80137590c7 100644
> --- a/lisp/progmodes/cc-mode.el
> +++ b/lisp/progmodes/cc-mode.el
> @@ -2549,18 +2549,26 @@ c-electric-pair-inhibit-predicate
> 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,
> -the default value of `electric-pair-inhibit-predicate' is called
> -and its value returned.
> +When CHAR is \" and not within a comment, t will be returned if
> +the quotes on the current line are already balanced (i.e. if the
> +last \" is not marked with a string fence syntax-table text
> +property). For other cases, the default value of
> +`electric-pair-inhibit-predicate' 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)) 'c-fl-syn-tab) '(15)))
> - (funcall (default-value 'electric-pair-inhibit-predicate) char)))
> + (or (and (eq char ?\")
> + (not (memq (cadr (c-semi-pp-to-literal (1- (point)))) '(c c++)))
> + (let ((last-quote (save-match-data
> + (save-excursion
> + (goto-char (c-point 'eoll))
> + (search-backward "\"")))))
> + (not (equal (c-get-char-property last-quote 'c-fl-syn-tab)
> + '(15)))))
> + (funcall (default-value 'electric-pair-inhibit-predicate) char)))
In the line starting (or (and (eq char ?\"), don't we still need an `if'
form? I think that otherwise, if any of the sub-forms of the `and'
return nil, we will call (default-value
'electric-pair-inhibit-predicate), which surely isn't what we want. If
we have a ", we want the CC Mode function to do all the work, only
delegating to the standard function when we don't have a ".
Or have I missed something?
[ .... ]
--
Alan Mackenzie (Nuremberg, Germany).
next prev parent reply other threads:[~2021-09-26 20:58 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-12 3:58 bug#50538: [PATCH] 28.0.50; electric-pair-mode fails to pair double quotes in some cases in CC mode Jim Porter
2021-09-12 6:26 ` Eli Zaretskii
2021-09-12 18:05 ` Jim Porter
2021-09-15 22:17 ` Jim Porter
2021-09-16 5:25 ` Eli Zaretskii
2021-09-16 12:40 ` Lars Ingebrigtsen
2021-09-16 12:59 ` Dmitry Gutov
2021-09-16 13:17 ` Lars Ingebrigtsen
2021-09-16 17:04 ` João Távora
2021-09-16 17:11 ` Eli Zaretskii
2021-09-16 17:33 ` João Távora
2021-09-16 17:29 ` Jim Porter
2021-09-16 19:05 ` Alan Mackenzie
2021-09-16 20:51 ` João Távora
2021-09-17 18:12 ` Alan Mackenzie
2021-09-16 18:26 ` Alan Mackenzie
2021-09-16 20:49 ` Alan Mackenzie
2021-09-16 21:36 ` Jim Porter
2021-09-17 17:08 ` Alan Mackenzie
2021-09-23 2:01 ` bug#50538: [PATCH v3] " Jim Porter
2021-09-26 20:58 ` Alan Mackenzie [this message]
2021-09-28 4:57 ` bug#50538: [PATCH v4] " Jim Porter
2021-10-03 17:58 ` bug#50538: [PATCH v5] " Jim Porter
2021-11-06 0:22 ` bug#50538: [PATCH] " Lars Ingebrigtsen
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YVDe/EzCJ+w8HEBZ@ACM \
--to=acm@muc.de \
--cc=50538@debbugs.gnu.org \
--cc=jporterbugs@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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.