From 931979b5c6ac0d16ee46365a1d770274ba9e03f0 Mon Sep 17 00:00:00 2001
From: Tom Willemse
Date: Mon, 22 Sep 2014 22:56:54 +0200
Subject: Use a keyring to store some credentials

---
 emacs/.emacs.d/init.el | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'emacs')

diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index d68499a..bc0338f 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -13,8 +13,7 @@
   (require 'esh-proc)
   (require 'fill-column-indicator)
   (require 'magit)
-  (require 'yasnippet)
-  (require 'noflet))
+  (require 'yasnippet))
 
 (load (concat user-emacs-directory "init2"))
 
@@ -658,7 +657,8 @@ For `python-mode' I prefer `python-imenu-create-flat-index'."
 (if (daemonp)
     (add-hook 'after-make-frame-functions
               (lambda (frame)
-                (noflet ((display-graphic-p (&optional display) t))
+                (cl-letf (((symbol-function 'display-graphic-p)
+                           (lambda () t)))
                   (oni:set-theme frame))))
   (oni:eval-after-init (oni:set-theme nil)))
 
-- 
cgit v1.2.3-54-g00ecf