Re: Accidental change of behaviour for electric-layout-mode?

[Morgan Willcock <morgan@ice9.digital>]

[-- Attachment #1: Type: text/plain, Size: 446 bytes --]

Eli Zaretskii <eliz@gnu.org> writes:

>> From: João Távora <joaotavora@gmail.com>
>> Date: Tue, 24 Sep 2024 13:12:24 +0100
>> Cc: Morgan Willcock <morgan@ice9.digital>, emacs-devel@gnu.org
>>
>> No, it wasn't.  I was probably experimenting with something.
>>
>> You can revert it (or make it optional), etc.
>
> Thanks.  So Morgan, please post a patch that makes this feature
> opt-in.

Patch is attached.

-- 
Morgan Willcock

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Restore-comment-string-check-for-electric-layout-mod.patch --]
[-- Type: text/x-diff, Size: 2030 bytes --]

From 0fe0d66aff7d4969e99478469afadede7e40f4ac Mon Sep 17 00:00:00 2001
From: Morgan Willcock <morgan@ice9.digital>
Date: Tue, 24 Sep 2024 19:33:11 +0100
Subject: [PATCH] Restore comment/string check for electric-layout-mode

This reverts an accidental change which allowed
electric-layout-mode to insert newlines inside strings and
comments.  The recent behavior can be restored by setting the
new variable 'electric-layout-allow-in-comment-or-string' to a
non-nil value.

* lisp/electric.el (electric-layout-allow-in-comment-or-string):
New variable to determine whether inserting newlines is
permitted within comments or strings.
(electric-layout-post-self-insert-function-1): Restore the
previous default behavior of not inserting newlines within
comments or strings.
---
 lisp/electric.el | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lisp/electric.el b/lisp/electric.el
index d02bcb4735b..d84faf5433f 100644
--- a/lisp/electric.el
+++ b/lisp/electric.el
@@ -385,6 +385,9 @@ electric-layout-rules
 (defvar electric-layout-allow-duplicate-newlines nil
   "If non-nil, allow duplication of `before' newlines.")
 
+(defvar electric-layout-allow-in-comment-or-string nil
+  "If non-nil, allow inserting newlines inside a comment or string.")
+
 (defun electric-layout-post-self-insert-function ()
   (when electric-layout-mode
     (electric-layout-post-self-insert-function-1)))
@@ -409,7 +412,10 @@ electric-layout-post-self-insert-function-1
                                 (goto-char pos)
                                 (funcall probe last-command-event))))
                          (when res (throw 'done res))))))))))
-    (when rule
+    (when (and rule
+               (or electric-layout-allow-in-comment-or-string
+                   ;; Not in a comment or string.
+                   (not (nth 8 (save-excursion (syntax-ppss pos))))))
       (goto-char pos)
       (when (functionp rule) (setq rule (funcall rule)))
       (dolist (sym (if (symbolp rule) (list rule) rule))
-- 
2.39.5