From: Ken Manheimer <ken.manheimer@gmail.com>
Date: Thu, 21 Jan 2016 18:38:58 +0000 (-0500)
Subject: multishell - Merge edge-case but significant fixes
X-Git-Url: https://code.delx.au/gnu-emacs-elpa/commitdiff_plain/4d1fad67524431f7c8f20bc62e503d49e8177fb8?hp=44207eadd7f8eb9192e128a0108efeb5e7f88009

multishell - Merge edge-case but significant fixes

including one case that can apply kill-buffer to the wrong buffer, sigh.
---

diff --git a/packages/multishell/multishell.el b/packages/multishell/multishell.el
index 62c9d3e85..7295aa1ea 100644
--- a/packages/multishell/multishell.el
+++ b/packages/multishell/multishell.el
@@ -319,11 +319,7 @@ customize the savehist group to activate savehist."
          (curr-buff-proc (get-buffer-process from-buffer))
          (target-buffer (if from-buffer-is-shell
                             from-buffer
-                          (let ((got (get-buffer target-shell-buffer-name)))
-                            (if (buffer-live-p got)
-                                got
-                              (kill-buffer got)
-                              (get-buffer target-shell-buffer-name)))))
+                          (get-buffer target-shell-buffer-name)))
          inwin
          already-there)
 
@@ -539,15 +535,16 @@ Return them as a list (name dir), with dir nil if none given."
         (cd default-directory)
       (error
        ;; Aargh. Need to isolate this tramp bug.
-       (when (and (stringp (cadr err))
-                  (string-equal (cadr err)
-                                "Selecting deleted buffer"))
-         (signal (car err)
-                 (list
-                  (format "%s, %s (\"%s\")"
-                          "Tramp shell can fail on empty (homedir) path"
-                          "please try again with an explicit path"
-                          (cadr err)))))))
+       (if (and (stringp (cadr err))
+                (string-equal (cadr err)
+                              "Selecting deleted buffer"))
+           (signal (car err)
+                   (list
+                    (format "%s, %s (\"%s\")"
+                            "Tramp shell can fail on empty (homedir) path"
+                            "please try again with an explicit path"
+                            (cadr err))))
+         (signal (car err)(cdr err)))))
     (setq buffer (set-buffer (apply 'make-comint
                                     (multishell-unbracket-asterisks buffer-name)
                                     prog