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

Improve popup + doom buffer handling

Browse source
This commit is contained in:
Henrik Lissner 2016-05-26 18:44:56 -04:00
parent f14f427744
commit ef9b59197a
4 changed files with 30 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

46
core/defuns/defuns-buffers.el
View file

@ -101,21 +101,23 @@ Inspired from http://demonastery.org/2013/04/emacs-evil-narrow-region/"
"Kill buffer (but only bury scratch buffer), then switch to a real buffer. Only buries
the buffer if it is being displayed in another window."
(interactive (list t))
(if (eq doom-buffer (current-buffer))
(progn
(when (= (length (get-buffer-window-list doom-buffer nil t)) 1)
(doom-mode-init t))
(when arg (message "Already in scratch buffer")))
(let ((new-dir (doom/project-root)))
(if (doom/popup-p (selected-window))
(doom/popup-close)
(if (> (length (get-buffer-window-list (current-buffer) nil t)) 1)
(bury-buffer)
(kill-this-buffer))
(unless (doom/real-buffer-p (current-buffer))
(doom/previous-real-buffer))
(when (get-buffer-window-list doom-buffer nil t)
(doom|update-scratch-buffer new-dir))))))
(if (eq doom-buffer (current-buffer))
(if (one-window-p)
(progn
(when (= (length (get-buffer-window-list doom-buffer nil t)) 1)
(doom-mode-init t))
(when arg (message "Already in scratch buffer")))
(doom/previous-real-buffer))
(let ((new-dir (doom/project-root)))
(if (doom/popup-p (selected-window))
(doom/popup-close)
(if (> (length (get-buffer-window-list (current-buffer) nil t)) 1)
(bury-buffer)
(kill-this-buffer))
(unless (doom/real-buffer-p (current-buffer))
(doom/previous-real-buffer))
(when (get-buffer-window-list doom-buffer nil t)
(doom|update-scratch-buffer new-dir))))))
;;;###autoload
(defun doom/kill-unreal-buffers ()
@ -270,14 +272,14 @@ buffers regardless of project."
(if bang
(org-capture-string text)
;; or scratch buffer by default
(let* ((project-dir (doom/project-root t))
(buffer-name doom-buffer-name))
(doom/popup-buffer buffer-name)
(with-current-buffer buffer-name
(with-current-buffer (doom/popup-buffer doom-buffer)
(doom|update-scratch-buffer nil t)
(unless (eq major-mode mode)
(funcall mode))
(unless doom-buffer-edited
(erase-buffer)
(doom|update-scratch-buffer)
(if text (insert text))
(funcall mode))))))
(setq doom-buffer-edited t))
(if text (insert text))))))
;;;###autoload (autoload 'doom:cd "defuns-buffers" nil t)
(evil-define-command doom:cd (dir)

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

@ -114,10 +114,12 @@
(local-set-key [escape escape] 'doom/popup-close)
(let ((map evil-normal-state-local-map))
(define-key map [escape escape] 'doom/popup-close)
(unless (apply #'derived-mode-p doom-popup-inescapable-modes)
(unless (or (apply #'derived-mode-p doom-popup-inescapable-modes)
(--any? (string-match-p it buffer-name) (-filter 'stringp doom-popup-inescapable-modes)))
(define-key map [escape] 'doom/popup-close)
(define-key map (kbd "ESC") 'doom/popup-close)))
(when (apply #'derived-mode-p doom-popup-protect-modes)
(when (or (apply #'derived-mode-p doom-popup-protect-modes)
(--any? (string-match-p it buffer-name) (-filter 'stringp doom-popup-protect-modes)))
(setq-local doom-popup-protect t)
(setq doom-last-popup (current-buffer))))))