Subject: bug#68401: 30.0.50; ERC 5.6-git: `erc-cmd-GMSG', `erc-cmd-AMSG', `erc-cmd-GME', `erc-cmd-AME'. 2nd attempt

From: Emanuel Berg <[email-masked]>
Date: Fri, 12 Jan 2024 15:12:57 +0100

Eli Zaretskii wrote:

> Our style is also to mention the interactive prompts in the
> doc string:
>
>     "Send LINE to all channels on all networks you are on.
>   Interactively, prompt for the line of text to send."

Here is a patch adding that, maybe if you apply it
sequentially after the first it will work?

I looked for a way to merge the two patches into one but
didn't find one, but I take it that is possible with git?
To create one patch out of all the commits?

>From 73f3cc5072bb8cc95ce5367cb8aef74e5b047f0d Mon Sep 17 00:00:00 2001
From: Emanuel Berg <[email-masked]>
Date: Fri, 12 Jan 2024 15:03:10 +0100
Subject: [PATCH 2/2] Docstrings for interactive use.

---
 lisp/erc/erc.el | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 06791bce520..aeb7722b563 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -4017,7 +4017,8 @@ erc--split-string-shell-cmd
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (defun erc-cmd-GMSG (line)
-  "Send LINE to all channels on all networks you are on."
+  "Send LINE to all channels on all networks you are on.
+Interactively, prompt for the line of text to send."
   (interactive "sSend to all channels: ")
   (setq line (erc-trim-string line))
   (erc-with-all-buffers-of-server nil
@@ -4026,7 +4027,8 @@ erc-cmd-GMSG
 (put 'erc-cmd-GMSG 'do-not-parse-args t)
 
 (defun erc-cmd-AMSG (line)
-  "Send LINE to all channels of the current network."
+  "Send LINE to all channels of the current network.
+Interactively, prompt for the line of text to send."
   (interactive "sSend to all channels on this network: ")
   (setq line (erc-trim-string line))
   (erc-with-all-buffers-of-server erc-server-process
@@ -4035,7 +4037,8 @@ erc-cmd-AMSG
 (put 'erc-cmd-AMSG 'do-not-parse-args t)
 
 (defun erc-cmd-GME (line)
-  "Send LINE as an action to all channels on all networks you are on."
+  "Send LINE as an action to all channels on all networks you are on.
+Interactively, prompt for the line of text to send."
   (interactive "sSend action to all channels: ")
   (erc-with-all-buffers-of-server nil
     (lambda () (erc-channel-p (erc-default-target)))
@@ -4043,7 +4046,8 @@ erc-cmd-GME
 (put 'erc-cmd-GME 'do-not-parse-args t)
 
 (defun erc-cmd-AME (line)
-  "Send LINE as an action to all channels on the current network."
+  "Send LINE as an action to all channels on the current network.
+Interactively, prompt for the line of text to send."
   (interactive "sSend action to all channels on this network: ")
   (erc-with-all-buffers-of-server erc-server-process
     (lambda () (erc-channel-p (erc-default-target)))
-- 
2.39.2

-- 
underground experts united
https://dataswamp.org/~incal