[elpa] externals/hyperbole 5cb81a3 09/21: Merge pull request #15 from matsl/use-shell-with-buf-name

[Stefan Monnier]

branch: externals/hyperbole
commit 5cb81a35950d0a7f8cd64cd63c6072c96518e192
Merge: 713aca8 bdd0ab0
Author: Robert Weiner <address@hidden>
Commit: GitHub <address@hidden>

    Merge pull request #15 from matsl/use-shell-with-buf-name
    
    Name Hyperbole shell with 'shell' call rather than separately
---
 hactypes.el | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/hactypes.el b/hactypes.el
index 1cd2f07..001d152 100644
--- a/hactypes.el
+++ b/hactypes.el
@@ -128,7 +128,7 @@ kill the last output to the shell buffer before executing 
SHELL-CMD."
                (hpath:display-buffer (current-buffer))
                (if (eq (minibuffer-window) (selected-window))
                    (other-window 1))
-               (shell) (rename-buffer buf-name)
+               (shell buf-name)
                (setq comint-last-input-start (point-marker)
                      comint-last-input-end (point-marker))))
          (hpath:display-buffer buf-name)
@@ -163,13 +163,11 @@ kill the last output to the shell buffer before executing 
SHELL-CMD."
          (save-excursion
            (save-window-excursion
              (cond ((fboundp 'new-shell) (new-shell))
-                   (t (shell)))
-             (setq shell-buf (current-buffer))))
+                   (t (shell buf-name)))))
          (message msg)
          ;; Wait for shell to startup before sending it input.
          (sit-for 1)
-         (set-buffer shell-buf)
-         (rename-buffer buf-name)
+         (set-buffer buf-name)
          (setq comint-last-input-start (point-marker)
                comint-last-input-end (point-marker)))
        (or (equal (buffer-name (current-buffer)) buf-name)