summaryrefslogtreecommitdiffstats
path: root/emacs
diff options
context:
space:
mode:
authorGravatar Tom Willemse2014-09-22 22:56:54 +0200
committerGravatar Tom Willemse2014-09-22 23:04:10 +0200
commit931979b5c6ac0d16ee46365a1d770274ba9e03f0 (patch)
tree45f5eb374670c1cb39130c544768131375c7a363 /emacs
parent9ccb99ee15f087a30eb746adb48984b49d5a6d79 (diff)
downloaddotfiles-931979b5c6ac0d16ee46365a1d770274ba9e03f0.tar.gz
dotfiles-931979b5c6ac0d16ee46365a1d770274ba9e03f0.zip
Use a keyring to store some credentials
Diffstat (limited to 'emacs')
-rw-r--r--emacs/.emacs.d/init.el6
1 files changed, 3 insertions, 3 deletions
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)))