From: Michael Albinus <michael.albinus@gmx.de>
Date: Fri, 13 Jul 2018 12:27:33 +0000 (+0200)
Subject: Fix format error in Faccept_process_output
X-Git-Tag: emacs-26.1.90~267
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1c862297e4ad50b14f246fca724e148538e7421b;p=emacs.git

Fix format error in Faccept_process_output

* src/process.c (Faccept_process_output): Do not use format spec
"%p", it isn't valid for error().
---

diff --git a/src/process.c b/src/process.c
index f7b96d28543..8629f834e79 100644
--- a/src/process.c
+++ b/src/process.c
@@ -4602,12 +4602,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