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

Fix dual windows when opening files via terminal #850

Browse source
This commit is contained in:
Henrik Lissner 2018-09-20 15:01:28 -04:00
parent e38b710f29
commit cc1c28a27c
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
modules/ui/doom-dashboard/config.el
View file

@ -101,7 +101,16 @@ PLIST can have the following properties:
;; Bootstrap ;; Bootstrap
(setq doom-fallback-buffer-name +doom-dashboard-name (setq doom-fallback-buffer-name +doom-dashboard-name
initial-buffer-choice #'+doom-dashboard-initial-buffer) ;; Fixes #850: `emacs file.txt' opens two windows, one for file.txt and
;; one for `initial-buffer-choice' (in `command-line-1'). We want one or
;; the other, not both.
initial-buffer-choice
(when (or (daemonp)
(not (cl-loop for arg in (cdr command-line-args)
if (and (string-match-p "^[^-]" arg)
(file-exists-p arg))
return t)))
#'+doom-dashboard-initial-buffer))
(add-hook 'window-setup-hook #'+doom-dashboard|init) (add-hook 'window-setup-hook #'+doom-dashboard|init)
@ -264,9 +273,7 @@ project (which may be different across perspective)."
(defun +doom-dashboard-initial-buffer () (defun +doom-dashboard-initial-buffer ()
"Returns buffer to display on startup. Designed for `initial-buffer-choice'." "Returns buffer to display on startup. Designed for `initial-buffer-choice'."
(if (string-match-p "^ ?\\*\\(?:scratch\\|server\\)" (buffer-name)) (get-buffer-create +doom-dashboard-name))
(get-buffer-create +doom-dashboard-name)
(current-buffer)))
(defun +doom-dashboard-p (buffer) (defun +doom-dashboard-p (buffer)
"Returns t if BUFFER is the dashboard buffer." "Returns t if BUFFER is the dashboard buffer."