X-Git-Url: http://olivier.miskin.fr/git/?a=blobdiff_plain;f=emacs%2Femacs.el;h=9eee3f887b0fdd8f9f287c281c9136ed6c94169c;hb=edd0af9bd4b2657a0981a0c91bc254795c8dde12;hp=f5fdb27da5890daf0aba75c7e566f80863b42465;hpb=e0470253097bbf42b1406a1cf7e1863336881604;p=dotfiles.git

diff --git a/emacs/emacs.el b/emacs/emacs.el
index f5fdb27..9eee3f8 100644
--- a/emacs/emacs.el
+++ b/emacs/emacs.el
@@ -30,35 +30,36 @@
 
 ;; 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 'uniquify)
+(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 
+    (progn
       (tool-bar-mode nil)
       (tooltip-mode nil)
       (scroll-bar-mode t)))
 
+;; font
+(if (>= emacs-major-version 23)
+  (set-frame-font "DejaVu Sans Mono-10"))
+
 ;; ,----
 ;; | Comportement
 ;; `----
@@ -73,6 +74,21 @@
 (setq display-time-24hr-format t)       ; Heure au format 24h
 (display-time)			        ; On affiche l'heure dans la barre
 (setq visible-bell t)	   		; On desactive les beeps
+(setq inhibit-startup-screen t)         ; On désactive le splash screen
+(setq use-file-dialog nil)              ; Désactivation des boites de
+(setq use-dialog-box nil)               ; fichiers GTK+
+(setq scroll-bar-mode 'right)
+(column-number-mode 1)
+
+;; Configuration d'uniquify
+(setq uniquify-buffer-name-style 'reverse)
+(setq uniquify-separator "|")
+(setq uniquify-after-kill-buffer-p t)
+(setq uniquify-ignore-buffers-re "^\\*")
+
+;; Les copiers/coller doivent aller dans le clipboard de l'OS
+(setq x-select-enable-clipboard t)
+(setq interprogram-paste-function 'x-cut-buffer-or-selection-value)
 
 ;; Quand vous recevez un fichier .txt d'une machine dos/windows il est
 ;; très énervant de voir les ^M a chaque fin de ligne, utiliser M-x
@@ -155,7 +171,7 @@
 (setq debian-changelog-full-name "Olivier Tétard")
 (setq debian-changelog-mailing-address "olivier.tetard@miskin.fr")
 
-(setq safe-local-variable-values 
+(setq safe-local-variable-values
       (quote ((TeX-PDF-mode . PDF))))
 
 ;; Stolen from http://xemacs.seanm.ca/lisp/dired-extras.el