General cleanup + refactor

This commit is contained in:
Henrik Lissner 2017-02-24 03:14:13 -05:00
parent ede6553959
commit 75a5e55255
3 changed files with 16 additions and 18 deletions

View file

@ -23,18 +23,18 @@ the buffer (if narrowed).
Inspired from http://demonastery.org/2013/04/emacs-evil-narrow-region/" Inspired from http://demonastery.org/2013/04/emacs-evil-narrow-region/"
(interactive "r") (interactive "r")
(if (region-active-p) (if (region-active-p)
(progn
(deactivate-mark)
(when clone-p
(let ((old-buf (current-buffer)))
(switch-to-buffer (clone-indirect-buffer nil nil))
(setq doom-buffer--narrowed-origin old-buf)))
(narrow-to-region beg end))
(if doom-buffer--narrowed-origin
(progn (progn
(kill-this-buffer) (deactivate-mark)
(switch-to-buffer doom-buffer--narrowed-origin) (when clone-p
(setq doom-buffer--narrowed-origin nil)) (let ((old-buf (current-buffer)))
(switch-to-buffer (clone-indirect-buffer nil nil))
(setq doom-buffer--narrowed-origin old-buf)))
(narrow-to-region beg end))
(if doom-buffer--narrowed-origin
(progn
(kill-this-buffer)
(switch-to-buffer doom-buffer--narrowed-origin)
(setq doom-buffer--narrowed-origin nil))
(widen)))) (widen))))

View file

@ -43,7 +43,6 @@
(advice-add 'switch-to-buffer :after '+workspaces*auto-add-buffer) (advice-add 'switch-to-buffer :after '+workspaces*auto-add-buffer)
(advice-add 'display-buffer :after '+workspaces*auto-add-buffer) (advice-add 'display-buffer :after '+workspaces*auto-add-buffer)
;; TODO Integration with projectile?
;; Create a new workspace on project switch ;; Create a new workspace on project switch
(defun doom|new-workspace-on-project-change () (defun doom|new-workspace-on-project-change ()
(let ((project-name (projectile-project-name))) (let ((project-name (projectile-project-name)))

View file

@ -46,9 +46,9 @@
(add-hook! 'kill-buffer-query-functions (add-hook! 'kill-buffer-query-functions
(if (not (+doom-dashboard-p)) (if (not (+doom-dashboard-p))
t t
(ignore-errors (+doom-dashboard-force-reload)) (ignore
(bury-buffer) (ignore-errors (+doom-dashboard-force-reload))
nil)) (bury-buffer))))
(add-hook! 'window-setup-hook (add-hook! 'window-setup-hook
(add-hook 'window-configuration-change-hook '+doom-dashboard-reload) (add-hook 'window-configuration-change-hook '+doom-dashboard-reload)
(+doom-dashboard-reload)) (+doom-dashboard-reload))
@ -79,10 +79,9 @@
"Erase the buffer and prepare it to be used like a normal buffer." "Erase the buffer and prepare it to be used like a normal buffer."
(unless +doom-dashboard-edited-p (unless +doom-dashboard-edited-p
(erase-buffer) (erase-buffer)
;; (set-window-margins (get-buffer-window (doom-fallback-buffer)) 0 0)
(setq +doom-dashboard-edited-p t (setq +doom-dashboard-edited-p t
mode-line-format +doom-dashboard-old-modeline) mode-line-format +doom-dashboard-old-modeline
(setq fringe-indicator-alist +doom-dashboard--old-fringe-indicator) fringe-indicator-alist +doom-dashboard--old-fringe-indicator)
(remove-hook 'evil-insert-state-entry-hook 'doom|mode-erase-on-insert t))) (remove-hook 'evil-insert-state-entry-hook 'doom|mode-erase-on-insert t)))
(defun +doom-dashboard-deferred-reload (&rest _) (defun +doom-dashboard-deferred-reload (&rest _)