From 3ca82c59de839f9c10318438ecc87f931b8a0208 Mon Sep 17 00:00:00 2001
From: Gemini Lasswell <gazally@runbox.com>
Date: Wed, 1 Aug 2018 09:22:32 -0700
Subject: [PATCH] Make lisp/thread.el the new home for thread-related Lisp
 functions

* lisp/emacs-lisp/thread-list.el: Remove.
* lisp/emacs-lisp/thread.el: Remove.
* lisp/thread.el: New file.
---
 lisp/emacs-lisp/thread.el                     | 44 -------------------
 lisp/{emacs-lisp/thread-list.el => thread.el} | 25 +++++++++--
 2 files changed, 21 insertions(+), 48 deletions(-)
 delete mode 100644 lisp/emacs-lisp/thread.el
 rename lisp/{emacs-lisp/thread-list.el => thread.el} (87%)

diff --git a/lisp/emacs-lisp/thread.el b/lisp/emacs-lisp/thread.el
deleted file mode 100644
index 5d7b90c26e9..00000000000
--- a/lisp/emacs-lisp/thread.el
+++ /dev/null
@@ -1,44 +0,0 @@
-;;; thread.el --- List active threads in a buffer -*- lexical-binding: t -*-
-
-;; Copyright (C) 2018 Free Software Foundation, Inc.
-
-;; Author: Gemini Lasswell <gazally@runbox.com>
-;; Maintainer: emacs-devel@gnu.org
-;; Keywords: lisp, tools, maint
-
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;;; Code:
-
-;;;###autoload
-(defun thread-handle-event (event)
-  "Handle thread events, propagated by `thread-signal'.
-An EVENT has the format
-  (thread-event THREAD ERROR-SYMBOL DATA)"
-  (interactive "e")
-  (if (and (consp event)
-           (eq (car event) 'thread-event)
-	   (= (length event) 4))
-      (let ((thread (cadr event))
-            (err (cddr event)))
-        (message "Error %s: %S" thread err))))
-
-(make-obsolete 'thread-alive-p 'thread-live-p "27.1")
-
-(provide 'thread)
-;;; thread.el ends here
diff --git a/lisp/emacs-lisp/thread-list.el b/lisp/thread.el
similarity index 87%
rename from lisp/emacs-lisp/thread-list.el
rename to lisp/thread.el
index af1177764b8..cb1e7721de9 100644
--- a/lisp/emacs-lisp/thread-list.el
+++ b/lisp/thread.el
@@ -1,10 +1,10 @@
-;;; thread-list.el --- List active threads in a buffer -*- lexical-binding: t -*-
+;;; thread.el --- Thread support in Emacs Lisp -*- lexical-binding: t -*-
 
 ;; Copyright (C) 2018 Free Software Foundation, Inc.
 
 ;; Author: Gemini Lasswell <gazally@runbox.com>
 ;; Maintainer: emacs-devel@gnu.org
-;; Keywords: lisp, tools, maint
+;; Keywords: thread, tools
 
 ;; This file is part of GNU Emacs.
 
@@ -29,6 +29,23 @@
 (require 'pcase)
 (require 'subr-x)
 
+;;;###autoload
+(defun thread-handle-event (event)
+  "Handle thread events, propagated by `thread-signal'.
+An EVENT has the format
+  (thread-event THREAD ERROR-SYMBOL DATA)"
+  (interactive "e")
+  (if (and (consp event)
+           (eq (car event) 'thread-event)
+	   (= (length event) 4))
+      (let ((thread (cadr event))
+            (err (cddr event)))
+        (message "Error %s: %S" thread err))))
+
+(make-obsolete 'thread-alive-p 'thread-live-p "27.1")
+
+;;; The thread list buffer and list-threads command
+
 (defcustom thread-list-refresh-seconds 0.5
   "Seconds between automatic refreshes of the *Threads* buffer."
   :group 'thread-list
@@ -124,5 +141,5 @@ Confirm with the user first."
         (when (and (threadp thread) (thread-alive-p thread))
           (thread-signal thread sgnl nil))))))
 
-(provide 'thread-list)
-;;; thread-list.el ends here
+(provide 'thread)
+;;; thread.el ends here
-- 
2.39.2