Move custom stuff to other file, random changes

git-svn-id: file:///svn/tfheen/trunk/dotfiles@469 8da78d58-1cd3-0310-bee5-d77bd1b3e8bf

diff --git a/emacs b/emacs
index bc804b7c1ca6e57d6f6950e305133a3b3d4a5dc1..65142485014b8ba97f604310d6bf30296682f3e1 100644 (file)
--- a/emacs
+++ b/emacs
@@ -8,10 +8,15 @@
 (message "loading .emacs-standard")
 (load "~/.emacs-standard")
 
+(setq vc-follow-symlinks t
+      custom-file (expand-file-name "~/.emacs-custom"))
+
 (cw/requiring-forms nil 
   (message "checking for local setup and loading..")
   (if (file-exists-p "/local/skel/all.emacs")
-      (load "/local/skel/all.emacs" nil t t)))
+      (load "/local/skel/all.emacs" nil t t))
+  (if (file-exists-p custom-file)
+      (load custom-file nil t t)))
 
 (setq tfheen-color-preference 'dark) ; light or dark
 
@@ -163,6 +168,7 @@
        (setq scrollbars-visible-p nil))))
 
 (setq scroll-bar-mode nil)
+(set-default-font "fixed")
 
 ;      show-paren-style 'expression)
 
@@ -233,56 +239,3 @@
  (if (not window-system)
      (define-coding-system-alias 'iso-8859-15 'iso-8859-1)))
 
-(setq vc-follow-symlinks t)
-
-;;; Custom stuff.
-;(custom-set-variables
-; '(ecb-source-path (quote ("~/data/ntnu/SIF8005/prosjekt/risk/")))
-; '(w3-user-fonts-take-precedence t)
-; '(gnuserv-program (concat exec-directory "/gnuserv"))
-; '(load-home-init-file t t)
-; '(py-beep-if-tab-change nil)
-; '(browse-url-temp-dir "~/tmp/")
-; '(jde-bug-vm-includes-jpda-p t)
-; '(w3-user-colors-take-precedence t))
-
-;;  (if (eq tfheen-color-preference 'dark) 
-;;      (custom-set-faces
-;;       '(w3-style-face-00003 ((t (:foreground "#000000" :background "black"))) t)
-;;       '(w3-style-face-00002 ((t (:background "black"))) t)
-;;      '(w3-style-face-00001 ((t (:background "black"))) t)
-;;       '(custom-set-face ((((class color)) (:foreground "blue" :background "black"))))
-;;       '(font-lock-keyword-face ((((class color) (background dark)) (:foreground "Maroon"))))
-;;       '(show-paren-mismatch-face ((((class color)) (:bold t :foreground "Red"))))
-;;       '(gnus-cite-face-3 ((t (:foreground "Green"))))
-;;       '(gnus-cite-face-2 ((t (:foreground "LightBlue"))))
-;;       '(gnus-cite-face-1 ((t (:foreground "Yellow"))))
-;;       '(show-paren-match-face ((((class color)) (:bold t :foreground "White"))))
-;;       '(font-lock-builtin-face ((((class color) (background dark)) (:foreground "BlueViolet")))))
-;;     (custom-set-faces
-;;      '(w3-style-face-00003 ((t (:foreground "#000000" :background "black"))) t)
-;;      '(w3-style-face-00002 ((t (:background "black"))) t)
-;;      '(w3-style-face-00001 ((t (:background "black"))) t)
-
-;;      '(custom-set-face ((((class color)) (:foreground "blue" :background "black"))))
-;;      '(sh-heredoc-face ((((class color) (background light)) (:foreground "DarkGreen"))))
-;;      '(font-lock-keyword-face ((t (:foreground "DarkBlue"))) t)
-;;      '(mmm-default-submode-face ((t (:background "White"))) t)
-;;      '(show-paren-mismatch-face ((((class color)) (:bold t :foreground "Red"))))
-;;      '(gnus-cite-face-3 ((t (:foreground "DarkGreen"))))
-;;      '(gnus-cite-face-2 ((t (:foreground "DarkRed"))))
-;;      '(gnus-cite-face-1 ((t (:foreground "DarkBlue"))))
-;;      '(show-paren-match-face ((((class color)) (:bold t :foreground "White"))))
-;;      '(font-lock-builtin-face ((((class color) (background dark)) (:foreground "BlueViolet"))))))
-
-;; Custom
-
-;; (custom-set-faces
-;;  '(custom-set-face ((((class color)) (:foreground "blue" :background "black"))))
-;;  '(font-lock-keyword-face ((t (:foreground "DarkBlue"))))
-;;  '(show-paren-mismatch-face ((((class color)) (:bold t :foreground "Red"))))
-;;  '(gnus-cite-face-3 ((t (:foreground "DarkGreen"))))
-;;  '(gnus-cite-face-2 ((t (:foreground "DarkRed"))))
-;;  '(gnus-cite-face-1 ((t (:foreground "DarkBlue"))))
-;;  '(show-paren-match-face ((((class color)) (:bold t :foreground "White"))))
-;;  '(font-lock-builtin-face ((((class color) (background dark)) (:foreground "BlueViolet")))))