rename thread-blocker to thread--blocker

2 files changed, 5 insertions, 4 deletions

diff --git a/doc/lispref/threads.texi b/doc/lispref/threads.texi
index 9c333546040..c846993172f 100644
--- a/doc/lispref/threads.texi
+++ b/doc/lispref/threads.texi
@@ -1,6 +1,6 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 2012
+@c Copyright (C) 2012, 2013
 @c   Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @node Threads
@@ -101,9 +101,10 @@ Return @code{t} if @var{thread} is alive, or @code{nil} if it is not.
 A thread is alive as long as its function is still executing.
 @end defun
 
-@defun thread-blocker thread
+@defun thread--blocker thread
 Return the object that @var{thread} is waiting on.  This function is
-primarily intended for debugging.
+primarily intended for debugging, and is given a ``double hyphen''
+name to indicate that.
 
 If @var{thread} is blocked in @code{thread-join}, this returns the
 thread for which it is waiting.
diff --git a/src/thread.c b/src/thread.c
index 20d0568bef5..39a21518ec6 100644
--- a/src/thread.c
+++ b/src/thread.c
@@ -804,7 +804,7 @@ DEFUN ("thread-alive-p", Fthread_alive_p, Sthread_alive_p, 1, 1, 0,
   return thread_alive_p (tstate) ? Qt : Qnil;
 }
 
-DEFUN ("thread-blocker", Fthread_blocker, Sthread_blocker, 1, 1, 0,
+DEFUN ("thread--blocker", Fthread_blocker, Sthread_blocker, 1, 1, 0,
        doc: /* Return the object that THREAD is blocking on.
 If THREAD is blocked in `thread-join' on a second thread, return that
 thread.