emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] emacs-26 1c86229 1/2: Fix format error in Faccept_process_


From: Michael Albinus
Subject: [Emacs-diffs] emacs-26 1c86229 1/2: Fix format error in Faccept_process_output
Date: Fri, 13 Jul 2018 08:28:28 -0400 (EDT)

branch: emacs-26
commit 1c862297e4ad50b14f246fca724e148538e7421b
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>

    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().
---
 src/process.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/process.c b/src/process.c
index f7b96d2..8629f83 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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]