X-Git-Url: https://git.siccegge.de//index.cgi?p=dotfiles%2Femacs.git;a=blobdiff_plain;f=config%2Fgeneral.el;h=76eba1a07e4266cd9d35449ff25d172f9ad2726c;hp=c8c406e43a8bab2dfa4b447a96d3d58e932af2f4;hb=a1e4bd5a5a8b698adfe9552ef565bf39dac74a41;hpb=18a7031d1ac5a62ce5abbbbedb1a8db2900944b6

diff --git a/config/general.el b/config/general.el
index c8c406e..76eba1a 100644
--- a/config/general.el
+++ b/config/general.el
@@ -1,6 +1,7 @@
 (message "General emacs setup")
 
-(tool-bar-mode -1)
+(if window-system
+    (tool-bar-mode -1))
 (setq inhibit-startup-message t)
 
 ;; Indentation
@@ -17,9 +18,11 @@
 (require 'uniquify)
 (setq uniquify-buffer-name-style 'post-forward)
 
-(require 'auto-complete)
+(if (locate-library "auto-complete")
+    (require 'auto-complete))
 
-(require 'magit)
+(if (locate-library "auto-complete")
+    (require 'magit))
 
 ;; Ido mode
 (require 'ido)
@@ -56,5 +59,8 @@
 (global-set-key (kbd "<XF86Paste>") 'paste-x-selection)
 (global-set-key (kbd "C-S-<insert>") 'paste-x-selection)
 
-(require 'dired-narrow)
-(define-key dired-mode-map "/" 'dired-narrow)
+
+(if (locate-library "dired-narrow")
+    (progn
+      (require 'dired-narrow)
+      (define-key dired-mode-map "/" 'dired-narrow)))