Re: send new reply from gnus hangs

[Eric Abrahamsen <eric@ericabrahamsen.net>]

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

Andy Moreton <andrewjmoreton@gmail.com> writes:

> On Mon 10 Jun 2019, Óscar Fuentes wrote:
>
>> Confirmed, reverting that commit fixes the problem.
>>
>>> Óscar Fuentes <ofv@wanadoo.es> writes:
>>>
>>> The problematic commit is
>>>
>>> master e51adfbdb7587c2b0b5ba154be210b30db82b4ea
>>> Author:     Oleh Krehel <ohwoeowho@gmail.com>
>>> AuthorDate: Thu Jun 6 16:01:10 2019 +0200
>>> Commit:     Oleh Krehel <ohwoeowho@gmail.com>
>>> CommitDate: Thu Jun 6 16:01:10 2019 +0200
>
> Thanks Óscar, that appears to be the problem.
>
> Looking at that commit, one call site calls `error' to abort sending the
> message, so the return value does not matter, but the other uses
> do-posting to set the return value from the `check-message' form, which
> is used by its caller.
>
>     AndyM

Okay, that worked!

What does everyone think of the attached diff? It moves the
`message-check' call out of the internal function (that seems like work
that should be done by the caller, not the internal function, and helps
the call fit in visually), and either returns nil or errors depending on
an optional arg.

E



[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: message-continuation-fix.diff --]
[-- Type: text/x-patch, Size: 2167 bytes --]

diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 9ce35cece4..012aec0067 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -4477,16 +4477,24 @@ message-send-mail-partially
 
 (declare-function hashcash-wait-async "hashcash" (&optional buffer))
 
-(defun message--check-continuation-headers ()
-  (message-check 'continuation-headers
+(defun message--check-continuation-headers (&optional errorp)
+  "Check for continuation headers and possibly fix.
+Return t if no fixes are necessary.  Prompt the user about fixing
+continuation lines and/or sending without fixing.  If user opts
+not to send, raise an error if ERRORP is non-nil, otherwise
+return nil."
+  (catch 'check
     (goto-char (point-min))
     (while (re-search-forward "^[^ \t\n][^ \t\n:]*[ \t\n]" nil t)
       (goto-char (match-beginning 0))
       (if (y-or-n-p "Fix continuation lines? ")
           (insert " ")
-        (forward-line 1)
-        (unless (y-or-n-p "Send anyway? ")
-          (error "Failed to send the message"))))))
+	(forward-line 1)
+	(unless (y-or-n-p "Send anyway? ")
+	  (if errorp
+              (error "Failed to send the message")
+	    (throw 'check nil)))))
+    t))
 
 (defun message--send-mail-maybe-partially ()
   (if (or (not message-send-mail-partially-limit)
@@ -4571,7 +4579,8 @@ message-send-mail
 	     (if news nil message-deletable-headers)))
 	(message-generate-headers headers))
       ;; Check continuation headers.
-      (message--check-continuation-headers)
+      (message-check 'continuation-headers
+	(message--check-continuation-headers 'error))
       (message--fold-long-headers)
       ;; Let the user do all of the above.
       (run-hooks 'message-header-hook))
@@ -5166,7 +5175,8 @@ message-check-news-header-syntax
 	   (if (= (length errors) 1) "this" "these")
 	   (if (= (length errors) 1) "" "s")
 	   (mapconcat 'identity errors ", ")))))))
-   (message--check-continuation-headers)
+   (message-check 'continuation-headers
+     (message--check-continuation-headers))
    ;; Check the Newsgroups & Followup-To headers for syntax errors.
    (message-check 'valid-newsgroups
      (let ((case-fold-search t)