[elpa] externals/multishell 1f77d77 22/23: * packages/multishell: require multishell from multishell-list,

[Stefan Monnier]

branch: externals/multishell
commit 1f77d7725813e4ab57ec5f3124c2db9e3db57f8b
Author: Ken Manheimer <ken.manheimer@gmail.com>
Commit: Ken Manheimer <ken.manheimer@gmail.com>

    * packages/multishell: require multishell from multishell-list,
    
    Remove now unnecessary autoload cookies.  Update version number so these
    are the revisions that are released.
---
 multishell-list.el |  5 ++---
 multishell.el      | 10 ++++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/multishell-list.el b/multishell-list.el
index 0c7a98a..5cecae0 100644
--- a/multishell-list.el
+++ b/multishell-list.el
@@ -3,16 +3,15 @@
 ;; Copyright (C) 2016-2020 Free Software Foundation, Inc. and Ken Manheimer
 
 ;; Author: Ken Manheimer <ken.manheimer@gmail.com>
-;; Version: 1.1.5
+;; Version: 1.1.8
 ;; Created: 2016 -- first public availability
 ;; Keywords: processes
 ;; URL: https://github.com/kenmanheimer/EmacsMultishell
 
 ;; See multishell.el for commentary, change log, etc.
 
-;; Load multishell to load this.
-
 (require 'tabulated-list)
+(require 'multishell)
 (eval-when-compile (require 'cl-lib))
 
 (defgroup multishell-list nil
diff --git a/multishell.el b/multishell.el
index 8ef2b5b..977f5b0 100644
--- a/multishell.el
+++ b/multishell.el
@@ -60,6 +60,11 @@
 ;;
 ;; Change Log:
 ;;
+;; * 2020-10-28 1.1.8 Ken Manheimer:
+;;   - Change back to having multishell-list require multishell,
+;;     rather than the other way around, and remove now unnecessary
+;;     new autoloads.
+;;   - Bump version for ELPA release.
 ;; * 2020-10-28 1.1.7 Ken Manheimer:
 ;;   - Forward compatibility: 'cl-progv' rather than 'progv', resolves
 ;;     multishell-list error in recent emacs versions.
@@ -165,9 +170,8 @@
 (require 'comint)
 (require 'shell)
 (require 'savehist)
-(require 'multishell-list)
 
-(defvar multishell-version "1.1.7")
+(defvar multishell-version "1.1.8")
 (defun multishell-version (&optional here)
   "Return string describing the loaded multishell version."
   (interactive "P")
@@ -304,7 +308,6 @@ Returns non-nil iff any changes were made."
             did-revisions t))
     did-revisions))
 
-;;;###autoload
 (defun multishell-history-entries (name)
   "Return `multishell-history' entry that starts with NAME, or nil if none."
   (let (got)
@@ -827,7 +830,6 @@ Returns nil for empty parts, rather than the empty string."
   (if (not (string= (substring name -1) "*"))
       (setq name (concat name "*")))
   name)
-;;;###autoload
 (defun multishell-unbracket (name)
   "Return a copy of name, removing asterisks, if any, at beginning and end."
   (if (string= (substring name 0 1) "*")