From 74257e4be560d2d8a35794576806fdfcba514e5c Mon Sep 17 00:00:00 2001
From: Yann Herklotz <git@yannherklotz.com>
Date: Tue, 30 Jul 2019 15:31:29 +0200
Subject: Fix checking of server

---
 emacs/loader.org | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'emacs')

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
-- 
cgit