about summary refs log tree commit diff
path: root/init/settings.el
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@gmail.com>2015-12-13T23·04+0100
committerVincent Ambo <tazjin@gmail.com>2015-12-13T23·04+0100
commitaf87ca21eeffe7faa7663ed23af20374f0407168 (patch)
tree78723367b63db14ab55213f47bc121a40d86c976 /init/settings.el
parent560176bc7789c2b0aa12b4dbab064f328c3454a5 (diff)
Various changes
Diffstat (limited to 'init/settings.el')
-rw-r--r--init/settings.el17
1 files changed, 5 insertions, 12 deletions
diff --git a/init/settings.el b/init/settings.el
index f58063a5dc70..4aa5da15dc10 100644
--- a/init/settings.el
+++ b/init/settings.el
@@ -1,5 +1,5 @@
 (require 'uniquify)
-(require 'smart-mode-line)
+; (require 'smart-mode-line)
 
 ; ## Generic settings ##
 
@@ -38,7 +38,8 @@
 
 (add-to-list 'exec-path "/usr/local/bin")
 (add-to-list 'exec-path (expand-file-name "~/bin"))
-
+;; Stack installs here:
+(add-to-list 'exec-path (expand-file-name "~/.local/bin"))
 
 (when window-system
   (setq frame-title-format '(buffer-file-name "%f" ("%b")))
@@ -148,16 +149,6 @@
                  line)
          'face 'linum)))
 
-(eval-after-load 'diff-mode
-  '(progn
-     (set-face-foreground 'diff-added "green4")
-     (set-face-foreground 'diff-removed "red3")))
-
-(eval-after-load 'magit
-  '(progn
-     (set-face-foreground 'magit-diff-add "green4")
-     (set-face-foreground 'magit-diff-del "red3")))
-
 ;; ## Mac specific settings ##
 
 ;; Enable mouse support on OS X
@@ -248,5 +239,7 @@
 ;; Use CUPS
 (setq lpr-command "xpp")
 
+;; Allow same window in two frames
+(setq ido-default-buffer-method 'selected-window)
 
 (provide 'settings)