[PATCH] Make c-ts-mode-toggle-comment-style match it's docstring.

[PATCH] Make c-ts-mode-toggle-comment-style match it's docstring.

[Felix]

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


Implement the optional numeric arg mentioned in the docstring.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: c-ts-comment.patch --]
[-- Type: text/x-patch, Size: 1450 bytes --]

diff --git a/lisp/progmodes/c-ts-mode.el b/lisp/progmodes/c-ts-mode.el
index 035df909eb2..9d4021866f0 100644
--- a/lisp/progmodes/c-ts-mode.el
+++ b/lisp/progmodes/c-ts-mode.el
@@ -87,19 +87,23 @@ c-ts-mode-indent-offset
   :safe 'integerp
   :group 'c)

-(defun c-ts-mode-toggle-comment-style ()
+(defun c-ts-mode-toggle-comment-style (&optional arg)
   "Toggle the comment style between block and line comments.
 Optional numeric ARG, if supplied, switches to block comment
 style when positive, to line comment style when negative, and
 just toggles it when zero or left out."
-  (interactive)
-  (pcase-let ((`(,starter . ,ender)
-               (if (string= comment-start "// ")
-                   (cons "/* " " */")
-                 (cons "// " ""))))
-    (setq-local comment-start starter
-                comment-end ender))
-  (c-ts-mode-set-modeline))
+  (interactive "P")
+  (let ((prevstate-line (string= comment-start "// ")))
+    (when (or (not arg)
+              (zerop (setq arg (prefix-numeric-value arg)))
+              (xor (> 0 arg) prevstate-line))
+      (pcase-let ((`(,starter . ,ender)
+                   (if prevstate-line
+                       (cons "/* " " */")
+                     (cons "// " ""))))
+        (setq-local comment-start starter
+                    comment-end ender))
+      (c-ts-mode-set-modeline))))

 (defun c-ts-mode-set-modeline ()
   (setq mode-name

Re: [PATCH] Make c-ts-mode-toggle-comment-style match it's docstring.

[Eli Zaretskii]

> From: Felix <felix.dick@web.de>
> Date: Mon, 27 Feb 2023 16:15:02 +0100
> 
> Implement the optional numeric arg mentioned in the docstring.

Thanks, installed on the emacs-29 branch.

This contribution all but exhausts the amount of code we can accept
from you without a copyright assignment.  Would you like to start your
legal paperwork at this time, so that you could keep sending
contributions without limitation?  If yes, I will send you the form to
fill.

Re: [PATCH] Make c-ts-mode-toggle-comment-style match it's docstring.

[Felix]

Eli Zaretskii <eliz@gnu.org> writes:

>> From: Felix <felix.dick@web.de>
>> Date: Mon, 27 Feb 2023 16:15:02 +0100
>>
>> Implement the optional numeric arg mentioned in the docstring.
>
> Thanks, installed on the emacs-29 branch.
>
> This contribution all but exhausts the amount of code we can accept
> from you without a copyright assignment.  Would you like to start your
> legal paperwork at this time, so that you could keep sending
> contributions without limitation?  If yes, I will send you the form to
> fill.

First of all, thanks for reviewing and accepting my patches!
Tiny as they are, the fact that they are now part of Emacs means a lot to me :)
And yes, please send me the form.
Thanks again!

Re: [PATCH] Make c-ts-mode-toggle-comment-style match it's docstring.

[Eli Zaretskii]

> From: Felix <felix.dick@web.de>
> Cc: emacs-devel@gnu.org
> Date: Tue, 28 Feb 2023 17:22:02 +0100
> 
> > This contribution all but exhausts the amount of code we can accept
> > from you without a copyright assignment.  Would you like to start your
> > legal paperwork at this time, so that you could keep sending
> > contributions without limitation?  If yes, I will send you the form to
> > fill.
> 
> First of all, thanks for reviewing and accepting my patches!
> Tiny as they are, the fact that they are now part of Emacs means a lot to me :)

Thank you for your contributions and for your interest in Emacs in
general.

> And yes, please send me the form.

Form sent off-list.