emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Don't mess up popups/neotree buffer when moving/swapping buffers

Browse source
This commit is contained in:
Henrik Lissner 2016-04-27 23:20:02 -04:00
parent fb25f716f9
commit a5ff60224d
4 changed files with 31 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
core/core-popup.el
View file

@ -68,9 +68,16 @@
;; There is no shackle-popup hook, so I hacked one in
(advice-add 'shackle-display-buffer :after 'narf|run-popup-hooks)
;; Keep track of popups
(add-hook! 'shackle-popup-hook '(narf|popup-init narf|hide-mode-line))
(add-hook 'shackle-popup-hook 'narf|popup-init) ; Keep track of popups
(add-hook 'shackle-popup-hook 'narf|hide-mode-line) ; No mode line in popups
;; Prevents popups from messaging with windows-moving functions
(after! defuns-popup
(defun narf*save-popups (orig-fun &rest args)
(narf/popup-save (apply orig-fun args)))
(advice-add 'narf--evil-window-move :around 'narf*save-popups)
(advice-add 'narf--evil-swap-windows :around 'narf*save-popups))
;;
;; Hacks

6
core/core-project.el
View file

@ -124,9 +124,11 @@
(apply orig-fun args)))
(advice-add 'neotree-create-node :around 'narf*neotree-create-node)
(defun narf*save-neotree (orig-fun &rest args)
(narf/neotree-save (apply orig-fun args)))
;; Prevents messing up the neotree buffer on window changes
(advice-add 'narf--evil-window-move :before 'narf|neotree-close-on-window-change)
(advice-add 'narf--evil-swap-windows :before 'narf|neotree-close-on-window-change)
(advice-add 'narf--evil-window-move :around 'narf*save-neotree)
(advice-add 'narf--evil-swap-windows :around 'narf*save-neotree)
;; A custom and simple theme for neotree
(advice-add 'neo-buffer--insert-fold-symbol :override 'narf*neo-buffer-fold-symbol))

9
core/defuns/defuns-neotree.el
View file

@ -17,6 +17,15 @@
(neotree-dir project-root))
(neotree-find path project-root)))))
;;;###autoload
(defmacro narf/neotree-save (&rest body)
`(let ((neo-p (neo-global--window-exists-p)))
(when neo-p (neotree-hide))
,@body
(when neo-p
(save-selected-window
(neotree-show)))))
;;;###autoload
(defun narf|neotree-close-on-window-change (&rest _)
"Close neotree to prevent ensuing mindow buggery."

9
core/defuns/defuns-popups.el
View file

@ -15,6 +15,15 @@
(-any? (lambda (w) (eq window w)) narf-popup-windows)
t)))
;;;###autoload
(defmacro narf/popup-save (&rest body)
`(let ((popup-p (narf/popup-p)))
(when popup-p (narf/popup-close-all t))
,@body
(when popup-p
(save-selected-window
(narf/popup-last-buffer)))))
;;;###autoload
(defun narf/popup-buffer (buffer &optional plist)
"Display BUFFER in a shackle popup."