Merge branch 'master' into light-emacs

Conflicts:
	emacs/emacs.el

diff --git a/emacs/emacs.el b/emacs/emacs.el
index 4cff13b..acef8dc 100644 (file)
--- a/emacs/emacs.el
+++ b/emacs/emacs.el
@@ -28,9 +28,6 @@
 
 (push (expand-file-name "~/.elisp") load-path)
 
-(load "tt25-passwords" t)
-
-(require 'color-theme)
 (require 'ido)
 (require 'uniquify)
 (require 'themes)
@@ -40,12 +37,6 @@
 ;; | Couleurs et apparence
 ;; `----
 
-;(if window-system)
-    (color-theme-tango)
-;;  (color-theme-dark-laptop))
-
-;old: (set-face-background 'default "black")
-
 (if window-system
     (progn
       (tool-bar-mode nil)