X-Git-Url: https://git.siccegge.de//index.cgi?a=blobdiff_plain;f=config%2Fgeneral.el;h=76eba1a07e4266cd9d35449ff25d172f9ad2726c;hb=64ae6b441963a7b54d4fe15cd304757d75ffdb0c;hp=1a80a6d7f473435cf7722caac53a73b0b5789600;hpb=27c85285f89b94bef7ba54c9b11da587941a6a7c;p=dotfiles%2Femacs.git

diff --git a/config/general.el b/config/general.el
index 1a80a6d..76eba1a 100644
--- a/config/general.el
+++ b/config/general.el
@@ -1,5 +1,9 @@
 (message "General emacs setup")
 
+(if window-system
+    (tool-bar-mode -1))
+(setq inhibit-startup-message t)
+
 ;; Indentation
 (setq tab-width 4)
 (setq-default tab-width 4)
@@ -14,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)
@@ -30,30 +36,19 @@
   (indent-region (point-min) (point-max) nil)
   (untabify (point-min) (point-max)))
 
-(when (>= emacs-major-version 23)
-  (global-linum-mode 1)
-  (setq linum-format "%3d")
-  (modify-all-frames-parameters
-     '((font . "DejaVu Sans Mono-9"))))
-
-;; Django template mode
-(when (locate-library "django-html-mode")
-  (require 'django-html-mode)
-  (message "Django HTML Mode available"))
+(global-linum-mode 1)
+(setq linum-format "%3d")
 
 ;; Some file extensions autoloading
 (add-to-list 'auto-mode-alist '("\\.mdn$" . markdown-mode))
-(add-to-list 'auto-mode-alist '("\\.dtpl$" . django-html-mode))
 
-(setq browse-url-generic-program (executable-find "midori")
+(setq browse-url-generic-program (executable-find "conkeror")
 	  browse-url-browser-function 'browse-url-generic)
 
 (global-set-key (kbd "C-x d") 'dired)
 
 (set-input-method "german-postfix")
 
-(load-file "/home/christoph/.emacs.d/rudel/rudel-loaddefs.el")
-
 (winner-mode)
 
 (defun paste-x-selection ()
@@ -65,10 +60,7 @@
 (global-set-key (kbd "C-S-<insert>") 'paste-x-selection)
 
 
-(defun paste-x-selection ()
-  (interactive)
-  (let ((x-select-enable-primary t)
-        (x-select-enable-clipboard nil))
-    (yank)))
-(global-set-key (kbd "<XF86Paste>") 'paste-x-selection)
-(global-set-key (kbd "C-S-<insert>") 'paste-x-selection)
+(if (locate-library "dired-narrow")
+    (progn
+      (require 'dired-narrow)
+      (define-key dired-mode-map "/" 'dired-narrow)))