aboutsummaryrefslogtreecommitdiffstats
path: root/emacs
diff options
context:
space:
mode:
authorYann Herklotz <git@yannherklotz.com>2019-07-30 15:31:29 +0200
committerYann Herklotz <git@yannherklotz.com>2019-07-30 15:31:29 +0200
commit74257e4be560d2d8a35794576806fdfcba514e5c (patch)
tree6740e8eec9d34070d262184d090ab47b28e12da4 /emacs
parentcb9152c0d1a55857a0da3151a3fa3ac3d05a4cd5 (diff)
downloaddotfiles-74257e4be560d2d8a35794576806fdfcba514e5c.tar.gz
dotfiles-74257e4be560d2d8a35794576806fdfcba514e5c.zip
Fix checking of server
Diffstat (limited to 'emacs')
-rw-r--r--emacs/loader.org7
1 files changed, 4 insertions, 3 deletions
diff --git a/emacs/loader.org b/emacs/loader.org
index 5766b55..ac58a8e 100644
--- a/emacs/loader.org
+++ b/emacs/loader.org
@@ -324,6 +324,7 @@ Setting up my keybindings
(define-key y-map (kbd "p") 'password-store-copy)
(define-key y-map (kbd "i") 'password-store-insert)
(define-key y-map (kbd "g") 'password-store-generate)
+ (define-key y-map (kbd "r") 'toggle-rot13-mode)
#+END_SRC
#+RESULTS:
@@ -1317,12 +1318,12 @@ Keybindings
(before theme-dont-propagate activate)
(mapc #'disable-theme custom-enabled-themes))
- (if server-process
- (add-hook 'after-make-frame-functions
+ (add-hook 'after-make-frame-functions
(lambda (frame)
(select-frame frame)
- (load-theme 'sanityinc-tomorrow-night t)
(toggle-scroll-bar -1)))
+
+ (unless (boundp 'server-process)
(progn (load-theme 'sanityinc-tomorrow-night t)
(toggle-scroll-bar -1)))
#+END_SRC