More constraints
Merge branch 'master' of https://github.com/tonicebrian/emacsconfig

* 'master' of https://github.com/tonicebrian/emacsconfig:
  First step on having different configurations for Windows and Linux
  More constraints
Revert "More constraints"

This reverts commit e91c3e0a87deb99dc67c6baa224bb5e4ac0ee373.