Skip to content

Commit

Permalink
Fix spacemacs|do-after-display-system-init
Browse files Browse the repository at this point in the history
Checking for system-type is not enough accurate, it broke when using
an X server under OS X because system-type is darwin but the
initialized display is x-initialized not ns-initialized.
  • Loading branch information
syl20bnr committed Jan 4, 2016
1 parent eea3df4 commit fa39bb1
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions core/core-display-init.el
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ the display system initialized."
"If the display-system is initialized, run `BODY', otherwise,
add it to a queue of actions to perform after the first graphical frame is
created."
`(let ((init (cond ((eq system-type 'darwin) 'ns-initialized)
((eq system-type 'windows-nt) 'w32-initialized)
((eq system-type 'gnu/linux) 'x-initialized)
`(let ((init (cond ((bound-and-true-p ns-initialized) 'ns-initialized)
((bound-and-true-p w32-initialized) 'w32-initialized)
((bound-and-true-p x-initialized) 'x-initialized)
(t 't)))) ; fallback to normal loading behavior
(if (symbol-value init)
(progn
Expand Down

0 comments on commit fa39bb1

Please sign in to comment.