change OS X installation instructions

So not it's recommended to install GNU emacs instead of emacs-mac as
discussed in #4955.
This commit is contained in:
d12frosted 2016-02-20 10:37:42 +02:00 committed by syl20bnr
parent 156508f92a
commit fa5e66c799

View file

@ -138,11 +138,10 @@ distributions as well.
### OS X
We recommend the homebrew [emacs-mac-port][] formula:
The recommended way of installing Emacs on OS X is using [homebrew][]:
```sh
$ brew tap railwaycat/homebrew-emacsmacport
$ brew install emacs-mac --with-spacemacs-icon # OR, brew cask install emacs-mac
$ brew install emacs --with-cocoa --with-gnutls --with-rsvg --with-imagemagick
$ brew linkapps
```
@ -155,12 +154,6 @@ is what transforms a regular Emacs into Spacemacs.
recommended to add the [osx layer][] to your [dotfile][]. Install instructions
are available in the [osx layer][] documentation.
Note that the `emacs-mac-port` server behaves differently than the regular Emacs
server which in particular **DOES NOT** allow multi-tty if you start GUI i.e.
you can't connect to the Emacs GUI server with `emacsclient` but server-client
works if you start from terminal(TTY-only).
Details can be found on the emacs-mac-port [README][emacs-mac-port-server].
### Windows
Good quality builds can be found [on this page][emacs-for-windows]. It is
@ -379,8 +372,7 @@ Thank you!
[osx layer]: http://spacemacs.org/layers/osx/README
[Gitter Chat]: https://gitter.im/syl20bnr/spacemacs
[Gitter Chat IRC server]: https://irc.gitter.im/
[emacs-mac-port]: https://github.com/railwaycat/homebrew-emacsmacport
[emacs-mac-port-server]: https://github.com/railwaycat/emacs-mac-port/blob/master/README-mac#L210-L213
[homebrew]: http://brew.sh
[emacs-for-windows]: http://emacsbinw64.sourceforge.net/
[the platinum searcher]: https://github.com/monochromegane/the_platinum_searcher
[so-server-unsafe]: http://stackoverflow.com/questions/885793/emacs-error-when-calling-server-start