projects
/
dotfiles.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into light-emacs
[dotfiles.git]
/
emacs
/
emacs.el
diff --git
a/emacs/emacs.el
b/emacs/emacs.el
index
9eee3f8
..
acef8dc
100644
(file)
--- a/
emacs/emacs.el
+++ b/
emacs/emacs.el
@@
-1,7
+1,7
@@
;; -*- emacs-lisp -*-
;; Author: Olivier Tetard <olivier.tetard@miskin.fr>
;; -*- emacs-lisp -*-
;; Author: Olivier Tetard <olivier.tetard@miskin.fr>
-;; URL : http://
www.miskin.be
/
+;; URL : http://
toutoune25.miskin.fr
/
;; This file is free software; you can redistribute it and/or modify it
;; under the terms of the GNU General Public License as published by the
;; This file is free software; you can redistribute it and/or modify it
;; under the terms of the GNU General Public License as published by the
@@
-28,13
+28,6
@@
(push (expand-file-name "~/.elisp") load-path)
(push (expand-file-name "~/.elisp") load-path)
-;; Mozmail is available in XEmacs CVS :
-;; http://cvs.xemacs.org/viewcvs.cgi/XEmacs/packages/xemacs-packages/net-utils/mozmail.el
-(load "mozmail" t)
-(load "tt25-passwords" t)
-;; (require 'tt25-muse)
-(load "tt25-erc" t)
-(require 'color-theme)
(require 'ido)
(require 'uniquify)
(require 'themes)
(require 'ido)
(require 'uniquify)
(require 'themes)
@@
-44,12
+37,6
@@
;; | Couleurs et apparence
;; `----
;; | 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)
(if window-system
(progn
(tool-bar-mode nil)
@@
-108,6
+95,9
@@
(set default-major-mode 'text-mode)
(add-hook 'text-mode-hook 'turn-on-auto-fill)
(set default-major-mode 'text-mode)
(add-hook 'text-mode-hook 'turn-on-auto-fill)
+;; Enable longlines-mode for LaTeX files
+(add-hook 'latex-mode-hook 'longlines-mode)
+
;; Impression
(setq lpr-command "/usr/bin/gtklp")
(setq ps-lpr-command "/usr/bin/gtklp")
;; Impression
(setq lpr-command "/usr/bin/gtklp")
(setq ps-lpr-command "/usr/bin/gtklp")