Several updates after 24.4 upgrade

4 files changed, 12 insertions, 4 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")))
diff --git a/init-modes.el b/init-modes.el
index 8ec6309d49d7..9141404b7421 100644
--- a/init-modes.el
+++ b/init-modes.el
@@ -48,7 +48,7 @@
 (setq cider-repl-popup-stacktraces t)
 
 ;; Enable projectile for all things programming
-(add-hook 'prog-mode-hook 'projectile-on)
+(add-hook 'prog-mode-hook 'projectile-mode)
 
 ;; Enable rainbow-delimiters for all things programming
 (add-hook 'prog-mode-hook 'rainbow-delimiters-mode)
diff --git a/init-settings.el b/init-settings.el
index d432adb382db..9601752ec61b 100644
--- a/init-settings.el
+++ b/init-settings.el
@@ -230,7 +230,14 @@
 
 (remove-hook 'kill-buffer-query-functions 'server-kill-buffer-query-function)
 
+;; Display tabs as 4 spaces
+(setq default-tab-width 4)
+
 ;; Set up Java home & path
-(setenv "JAVA_HOME" "/opt/java")
+(setenv "JAVA_HOME" "/usr/lib/jvm/default")
+
+;; Use CUPS
+(setq lpr-command "xpp")
+
 
 (provide 'init-settings)
diff --git a/init.el b/init.el
index 69ca725daddf..90fc92c09cff 100644
--- a/init.el
+++ b/init.el
@@ -115,5 +115,5 @@
 (random t)
 
 ;; SML should respect theme colours
-(setq sml/theme 'black)
+; (setq sml/theme 'black)
 (sml/setup)