[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 4d1fad6 3/4: multishell - Merge edge-case but significant
From: |
ken manheimer |
Subject: |
[elpa] master 4d1fad6 3/4: multishell - Merge edge-case but significant fixes |
Date: |
Thu, 21 Jan 2016 18:46:46 +0000 |
branch: master
commit 4d1fad67524431f7c8f20bc62e503d49e8177fb8
Merge: 44207ea 3e639bf
Author: Ken Manheimer <address@hidden>
Commit: Ken Manheimer <address@hidden>
multishell - Merge edge-case but significant fixes
including one case that can apply kill-buffer to the wrong buffer, sigh.
---
packages/multishell/multishell.el | 25 +++++++++++--------------
1 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/packages/multishell/multishell.el
b/packages/multishell/multishell.el
index 62c9d3e..7295aa1 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