summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2015-11-24 22:04:37 -0500
committerKyle Meyer <kyle@kyleam.com>2015-11-24 22:04:37 -0500
commit1ba192ea6e5d97b8e4450d1400a83c4ad1e41c1a (patch)
tree3ea86771b64fa6d82d81faeba672230fe223b84b /lisp
parent94e9d81206f0661ea6258adcb4e984292e7d0225 (diff)
downloademacs.d-1ba192ea6e5d97b8e4450d1400a83c4ad1e41c1a.tar.gz
zsh-toggle-ansi-term-home: Remove directory from name
Diffstat (limited to 'lisp')
-rw-r--r--lisp/init-external.el15
1 files changed, 10 insertions, 5 deletions
diff --git a/lisp/init-external.el b/lisp/init-external.el
index e765a6b..829c5dd 100644
--- a/lisp/init-external.el
+++ b/lisp/init-external.el
@@ -29,7 +29,7 @@
(start-process "ext-term" nil km/terminal))
(define-key km/external-map "t" 'km/open-external-terminal)
-(defun km/zsh-ansi-term (&optional directory)
+(defun km/zsh-ansi-term (&optional directory name)
"Open an ansi-term buffer running ZSH in DIRECTORY.
If a terminal for DIRECTORY already exists, switch to that
@@ -44,10 +44,15 @@ ZSH terminal directories.
With a C-u prefix argument, set DIRECTORY to the user home
directory.
-With any other non-nil value, prompt for a directory."
+With any other non-nil value, prompt for a directory.
+
+If NAME is non-nil, use *NAME* for the buffer name instead of
+*zsh: DIRECTORY*. If that buffer already exists, it will be
+grabbed regardless of whether its default-directory matches
+DIRECTORY."
(interactive (km/zsh-ansi-term--args))
(let* ((dir (abbreviate-file-name directory))
- (name (concat "zsh: " dir))
+ (name (or name (concat "zsh: " dir)))
(full-name (concat "*" name "*"))
(default-directory dir))
(cond
@@ -60,9 +65,9 @@ With any other non-nil value, prompt for a directory."
(defun km/zsh-toggle-ansi-term-home ()
(interactive)
- (if (string= "*zsh: ~/*" (buffer-name))
+ (if (string= "*zsh*" (buffer-name))
(bury-buffer)
- (km/zsh-ansi-term "~/")))
+ (km/zsh-ansi-term "~/" "zsh")))
(defun km/zsh-ansi-term-other-window (&optional directory)
(interactive (km/zsh-ansi-term--args))