Merge from origin/emacs-26

17ebb6e (origin/emacs-26) Use consistent function names in thread-tes...
1c86229 Fix format error in Faccept_process_output
b38b91a Lessen stack consumption in recursive read1
3eb4603 Match w32 paths in grep sans --null hits (Bug#32051)
5cc7c4b Fix previous make-network-process change
d6a1b69 Another documentation improvement in flyspell.el
9b49a8e Improve documentation of Flyspell
3744fda Provide feature 'threads
ef9025f Save the server alias on reconnect (Bug#29657)
db3874b Refer to "proper lists" instead of "true lists"
35e0305 Avoid turning on the global-minor-mode recursively
51bf4e4 Fix Bug#32085

1 files changed, 6 insertions, 7 deletions

diff --git a/src/process.c b/src/process.c
index 5bd8c255a26..3fccd962da6 100644
--- a/src/process.c
+++ b/src/process.c
@@ -3905,7 +3905,7 @@ usage: (make-network-process &rest ARGS)  */)
   CHECK_STRING (name);
 
   /* :local ADDRESS or :remote ADDRESS */
-  if (!NILP (server))
+  if (NILP (server))
     address = Fplist_get (contact, QCremote);
   else
     address = Fplist_get (contact, QClocal);
@@ -4612,12 +4612,11 @@ is nil, from any process) before the timeout expired.  */)
         {
           Lisp_Object proc_thread_name = XTHREAD (proc->thread)->name;
 
-          if (STRINGP (proc_thread_name))
-            error ("Attempt to accept output from process %s locked to thread %s",
-                   SDATA (proc->name), SDATA (proc_thread_name));
-          else
-            error ("Attempt to accept output from process %s locked to thread %p",
-                   SDATA (proc->name), XTHREAD (proc->thread));
+          error ("Attempt to accept output from process %s locked to thread %s",
+                 SDATA (proc->name),
+                 STRINGP (proc_thread_name)
+                 ? SDATA (proc_thread_name)
+                 : SDATA (Fprin1_to_string (proc->thread, Qt)));
         }
     }
   else