Fix a bad merge
This commit is contained in:
parent
960d9aca60
commit
f859cf0fe8
2 changed files with 17 additions and 7 deletions
|
@ -27,7 +27,9 @@ Or you can use another theme altogether by adding something in `personal/preload
|
|||
(setq prelude-theme 'tango)
|
||||
```
|
||||
|
||||
**Note** To use a non-built-in theme, like [Solarized](https://github.com/bbatsov/zenburn-emacs),
|
||||
!!! Note
|
||||
|
||||
To use a non-built-in theme, like [Solarized](https://github.com/bbatsov/solarized-emacs),
|
||||
you'll have to install it from MELPA first by `M-x package-install RET solarized-theme`. Then add
|
||||
|
||||
``` lisp
|
||||
|
@ -51,7 +53,7 @@ lexicographical order. The overall loading precedence is:
|
|||
|
||||
1. `personal/preload/*`
|
||||
2. `core/`
|
||||
3. `prelude-modules.el`
|
||||
3. `personal/prelude-modules.el` (or deprecated `prelude-modules.el`)
|
||||
4. `personal/*`
|
||||
|
||||
#### Personalization Example
|
||||
|
|
14
doc/usage.md
14
doc/usage.md
|
@ -140,9 +140,17 @@ If you want to swap them add this to your personal config:
|
|||
|
||||
You can also temporarily swap them with `C-c w` (`M-x prelude-swap-meta-and-super`).
|
||||
|
||||
**Note**: I'd highly recommend to all macOS users to consider
|
||||
[remapping Return to
|
||||
Control](http://emacsredux.com/blog/2013/11/12/a-crazy-productivity-boost-remap-return-to-control/)
|
||||
!!! Tip
|
||||
|
||||
[The Emacs Mac port](https://bitbucket.org/mituharu/emacs-mac.git) comes
|
||||
with `Command`
|
||||
[set](https://bitbucket.org/mituharu/emacs-mac/src/7fdbfba85d543f01b81e997e2b03788c35cb3bfa/src/macterm.c?at=master&fileviewer=file-view-default#macterm.c-6147:6169)
|
||||
to `Meta`.
|
||||
|
||||
!!! Tip
|
||||
|
||||
I'd highly recommend to all macOS users to consider
|
||||
[remapping Return to Control](http://emacsredux.com/blog/2013/11/12/a-crazy-productivity-boost-remap-return-to-control/)
|
||||
instead. That's an epic productivity boost and it's not as crazy as it sounds!
|
||||
|
||||
#### Projectile
|
||||
|
|
Loading…
Reference in a new issue