summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Tom Willemsen2012-10-23 00:23:36 +0200
committerGravatar Tom Willemsen2012-10-23 00:23:36 +0200
commitaf62874a4a0023a572a1df84ec441376ee66c59b (patch)
treebb32e8994f1c99b49a37eb2b9d4f92e5e3656e29
parentae482bccfedbfc6a7ed976d692342453fdad5cd2 (diff)
downloaddotfiles-af62874a4a0023a572a1df84ec441376ee66c59b.tar.gz
dotfiles-af62874a4a0023a572a1df84ec441376ee66c59b.zip
.emacs.d/init.el
-rw-r--r--.emacs.d/init.el5
1 files changed, 2 insertions, 3 deletions
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 173c285..4dc6873 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -337,9 +337,7 @@
(global-set-key (kbd "\"") 'oni:self-insert-dwim)
(if (daemonp)
- (global-set-key "\C-x\C-c" 'oni:close-client-window)
- (unless (server-running-p)
- (server-start)))
+ (global-set-key "\C-x\C-c" 'oni:close-client-window))
(when (or window-system (daemonp))
(global-unset-key "\C-z"))
@@ -404,6 +402,7 @@
(global-set-key (kbd "C-z") 'quick-edit-mode)
(unless (server-running-p)
+ (server-start)
(load "wm-init"))
(provide 'init)