gitback/doomemacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve doom scratch buffer stability

Browse Source
This commit is contained in:
Henrik Lissner 2016-09-15 14:34:18 +02:00
parent 60b899b9c9
commit b9aeb03ff4
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
core/core-scratch.el
View File

@ -16,34 +16,31 @@
(define-derived-mode doom-mode fundamental-mode "DOOM" (define-derived-mode doom-mode fundamental-mode "DOOM"
"Major mode for special DOOM buffers.") "Major mode for special DOOM buffers.")
;; Update the doom buffer if it's visible during a killing
(add-hook! 'kill-buffer-query-functions
(when (and (get-buffer-window-list doom-buffer nil t)
(not doom-buffer-edited))
(doom-mode-init t))
t)
;; Don't kill the scratch buffer ;; Don't kill the scratch buffer
(add-hook! 'kill-buffer-query-functions (add-hook! 'kill-buffer-query-functions
(not (eq doom-buffer (current-buffer)))) (not (eq doom-buffer (current-buffer))))
(add-hook 'emacs-startup-hook 'doom-mode-init)
(after! uniquify (after! uniquify
(setq uniquify-ignore-buffers-re (regexp-quote doom-buffer-name))) (setq uniquify-ignore-buffers-re (regexp-quote doom-buffer-name)))
(add-hook! emacs-startup 'doom-mode-init)
(defun doom-mode-erase-on-insert () (defun doom-mode-erase-on-insert ()
(erase-buffer) (erase-buffer)
(setq doom-buffer-edited t) (setq doom-buffer-edited t)
(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|update-scratch-buffer-hook (&rest _)
(doom|update-scratch-buffer))
(defun doom-mode-init (&optional auto-detect-frame) (defun doom-mode-init (&optional auto-detect-frame)
(unless (buffer-live-p doom-buffer) (setq doom-buffer nil))
(let ((old-scratch (get-buffer "*scratch*"))) (let ((old-scratch (get-buffer "*scratch*")))
(when old-scratch (when old-scratch
(with-current-buffer old-scratch (with-current-buffer old-scratch
(rename-buffer doom-buffer-name) (rename-buffer doom-buffer-name)
(setq doom-buffer old-scratch)))) (setq doom-buffer old-scratch))))
(unless (buffer-live-p doom-buffer)
(setq doom-buffer nil))
(unless doom-buffer (unless doom-buffer
(setq doom-buffer (get-buffer-create doom-buffer-name))) (setq doom-buffer (get-buffer-create doom-buffer-name)))
(with-current-buffer doom-buffer (with-current-buffer doom-buffer
@ -96,7 +93,10 @@
(format "Loaded in %.3fs" (format "Loaded in %.3fs"
(float-time (time-subtract after-init-time emacs-start-time))))))))) (float-time (time-subtract after-init-time emacs-start-time)))))))))
(back-to-indentation) (back-to-indentation)
(doom|update-scratch-buffer nil t))) (doom|update-scratch-buffer nil t)
;; Readjust the scratch buffer if it is visible, when the window config changes.
(add-hook 'window-configuration-change-hook 'doom|update-scratch-buffer-hook)))
(provide 'core-scratch) (provide 'core-scratch)
;;; core-scratch.el ends here ;;; core-scratch.el ends here