about summary refs log tree commit diff
path: root/init-custom.el
diff options
context:
space:
mode:
authorVincent Ambo <vincent@kivra.com>2014-10-21T17·11+0200
committerVincent Ambo <vincent@kivra.com>2014-10-21T17·11+0200
commit10057a887b931b25d93691992c35665cac277fcb (patch)
tree9e4010cc30bc972ee6ddb37ab96a8bea6a87c3ea /init-custom.el
parentbbe5e31268640900296822815e1b7476a1e0968a (diff)
Several updates after 24.4 upgrade
Diffstat (limited to 'init-custom.el')
-rw-r--r--init-custom.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/init-custom.el b/init-custom.el
index 5ad8ebe983b9..18af68c890e0 100644
--- a/init-custom.el
+++ b/init-custom.el
@@ -5,9 +5,10 @@
  ;; If there is more than one, they won't work right.
  '(ac-auto-show-menu 0.8)
  '(ac-delay 0.2)
- '(custom-safe-themes (quote ("6e92ca53a22d9b0577ad0b16e07e2e020c8b621197e39fec454048e51b7954cb" default)))
+ '(custom-safe-themes (quote ("6a37be365d1d95fad2f4d185e51928c789ef7a4ccf17e7ca13ad63a8bf5b922f" "6e92ca53a22d9b0577ad0b16e07e2e020c8b621197e39fec454048e51b7954cb" default)))
  '(frame-brackground-mode (quote dark))
  '(global-auto-complete-mode t)
+ '(magit-log-show-gpg-status t)
  '(ns-alternate-modifier (quote none))
  '(ns-command-modifier (quote meta))
  '(org-agenda-files (quote ("~/source/spotify-puppet/modules/jira/TODO.org")))