X-Git-Url: https://git.siccegge.de//index.cgi?p=dotfiles%2Femacs.git;a=blobdiff_plain;f=config%2Fgeneral.el;h=969afe7cf076121782d1050b56d2186dc4121e88;hp=1a80a6d7f473435cf7722caac53a73b0b5789600;hb=a1c59cfcf4c8ac4da3c7a5f1ab4f5c923faaadec;hpb=150a2864e2a975b540a16c12d06e0ba00ae59553

diff --git a/config/general.el b/config/general.el
index 1a80a6d..969afe7 100644
--- a/config/general.el
+++ b/config/general.el
@@ -30,30 +30,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 ()
@@ -63,12 +52,3 @@
     (yank)))
 (global-set-key (kbd "<XF86Paste>") 'paste-x-selection)
 (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)