wgester/dotfiles
1
0
Fork 0
forked from colonelpanic/dotfiles
Code Pull Requests Activity

Handle delete buffers in imalison:term-buffer

Browse Source
This commit is contained in:
Ivan Malison 2015-10-15 23:29:59 -07:00
parent e46492be46
commit fbe48c5a70
1 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
dotfiles/emacs.d/init.el
View File

@ -551,13 +551,7 @@ The current directory is assumed to be the project's root otherwise."
(defmethod im-put ((im indexed-mapping) key value) (defmethod im-put ((im indexed-mapping) key value)
;; Handle removing the key from where it is currently indexed ;; Handle removing the key from where it is currently indexed
(let* ((current-value (plist-get (oref im :mapping) key)) (im-unindex im key value)
(value-list (plist-get (oref im :index) current-value)))
(when value-list
(setq value-list (remove key value-list))
(oset im :index
(plist-put (oref im :index)
current-value value-list))))
;; Add the key to its new position in the index ;; Add the key to its new position in the index
(oset im :index (oset im :index
(plist-put (oref im :index) (plist-put (oref im :index)
@ -566,6 +560,20 @@ The current directory is assumed to be the project's root otherwise."
(oset im :mapping (oset im :mapping
(plist-put (oref im :mapping) key value))) (plist-put (oref im :mapping) key value)))
(defmethod im-unindex ((im indexed-mapping) key value)
(let* ((current-value (plist-get (oref im :mapping) key))
(value-list (plist-get (oref im :index) current-value)))
(when value-list
(setq value-list (remove key value-list))
(oset im :index
(plist-put (oref im :index)
current-value value-list)))))
(defmethod im-delete ((im indexed-mapping) key)
(im-unindex im key (im-get im key))
(oset im :mapping
(use-package-plist-delete (oref im :mapping) key)))
(use-package term (use-package term
:preface :preface
(progn (progn
@ -591,15 +599,22 @@ The current directory is assumed to be the project's root otherwise."
(term-set-escape-char ?\C-x))) (term-set-escape-char ?\C-x)))
buffer)) buffer))
(defun imalison:dir-term (directory) (defun imalison:term-buffer (directory)
(interactive (list default-directory)) (let* ((directory-symbol (imalison:term-sym directory))
(let ((buffer (or (im-index-get-one imalison:buffer-index (imalison:term-sym directory)) (buffer (im-index-get-one imalison:buffer-index directory-symbol)))
(imalison:build-term directory)))) (while (and buffer (not (buffer-live-p buffer)))
(switch-to-buffer buffer))) (im-delete imalison:buffer-index buffer)
(setq buffer (im-index-get-one imalison:buffer-index directory-symbol)))
(or buffer (imalison:build-term directory))))
(defun imalison:projectile-term () (defun imalison:projectile-term ()
(interactive) (interactive)
(imalison:dir-term (projectile-project-root))) (switch-to-buffer (imalison:term-buffer (projectile-project-root))))
(defun imalison:dir-term ()
(interactive)
(switch-to-buffer (imalison:term-buffer default-directory)))
(imalison:prefix-alternatives imalison:term imalison:dir-term imalison:projectile-term)) (imalison:prefix-alternatives imalison:term imalison:dir-term imalison:projectile-term))
:config :config
(progn (progn