Merge branch 'master' into amossys

diff --git a/emacs.el b/emacs.el
index 89fff19..2fd9b78 100644 (file)
--- a/emacs.el
+++ b/emacs.el
@@ -132,7 +132,7 @@
 
 ;; Configuration de debian-changelog
 (setq debian-changelog-full-name "Olivier Tétard")
-(setq debian-changelog-mailing-address "olivier.tetard@miskin.fr")
+(setq debian-changelog-mailing-address "olivier.tetard@amossys.fr")
 
 (setq safe-local-variable-values
       (quote ((TeX-PDF-mode . PDF))))
@@ -209,3 +209,4 @@ The function is not passed any arguments. The function honours restrictions."
  '(highlight-current-line-face ((t (:background "#6699cc"))))
  '(muse-bad-link-face ((t (:foreground "DeepPink" :underline "DeepPink" :weight bold))))
  '(muse-link-face ((t (:foreground "blue" :underline "blue" :weight bold)))))
+(put 'scroll-left 'disabled nil)

diff --git a/gitconfig b/gitconfig
index f4d2cfb..a6f53a5 100644 (file)
--- a/gitconfig
+++ b/gitconfig
@@ -6,4 +6,4 @@
        main-window-view = HistoryView
 [user]
        name = Olivier Tétard
-       email = olivier.tetard@miskin.fr
+       email = olivier.tetard@amossys.fr

diff --git a/zshenv b/zshenv
index 565a70f..c26bd5b 100644 (file)
--- a/zshenv
+++ b/zshenv
@@ -10,7 +10,7 @@ export PYTHONPATH=$PYTHONPATH:$HOME/apps/lib/python:$HOME/apps/lib/python2.6/sit
 export VISUAL="emacsclient"
 export EDITOR="emacsclient"
 
-export EMAIL="olivier.tetard@miskin.fr"
+export EMAIL="olivier.tetard@amossys.fr"
 
 umask 027