Emacs.el: modification du chargement des dépendances (load) et changement du thème

diff --git a/emacs/emacs.el b/emacs/emacs.el
index f5fdb27..0ccddb3 100644 (file)
--- a/emacs/emacs.el
+++ b/emacs/emacs.el
@@ -30,28 +30,24 @@
 
 ;; Mozmail is available in XEmacs CVS :
 ;; http://cvs.xemacs.org/viewcvs.cgi/XEmacs/packages/xemacs-packages/net-utils/mozmail.el
-(require 'mozmail)
-(require 'tt25-passwords)
+(load "mozmail" t)
+(load "tt25-passwords" t)
 ;; (require 'tt25-muse)
-(require 'tt25-erc)
+(load "tt25-erc" t)
 (require 'color-theme)
 (require 'ido)
+(require 'themes)
 
-;; Pour Wikipedia
-(require 'wikipedia-mode)
-(autoload 'longlines-mode "longlines.el"
-     "Minor mode for editing long lines." t)
-(add-to-list 'auto-mode-alist '("mozex.\\.*" . wikipedia-mode))
 
 ;; ,----
 ;; | Couleurs et apparence
 ;; `----
 
-(if window-system
-    (color-theme-resolve)
-  (color-theme-dark-laptop))
+;(if window-system)
+    (color-theme-tango)
+;;  (color-theme-dark-laptop))
 
-(set-face-background 'default "black")
+;old: (set-face-background 'default "black")
 
 (if window-system
     (progn 
@@ -59,6 +55,10 @@
       (tooltip-mode nil)
       (scroll-bar-mode t)))
 
+;; font
+(if (>= emacs-major-version 23)
+  (set-default-font "DejaVu Sans Mono-10"))
+
 ;; ,----
 ;; | Comportement
 ;; `----