Merge branch 'master' into amossys

[dotfiles2.git] / emacs.el

diff --git a/emacs.el b/emacs.el
index e9eff9d..03fc618 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))))
@@ -159,6 +159,7 @@ The function is not passed any arguments. The function honours restrictions."
 (require 'twittering-mode)
 (setq twittering-use-master-password t)
 (setq twittering-icon-mode t)
+(setq twittering-scroll-mode t)
 (setq twittering-timer-interval 300)
 (setq twittering-url-show-status nil)
 (add-hook 'twittering-new-tweets-hook
@@ -169,6 +170,11 @@ The function is not passed any arguments. The function honours restrictions."
                             "New tweets"
                             (format "You have %d new tweet%s"
                                     n (if (> n 1) "s" ""))))))
+(setq twittering-initial-timeline-spec-string
+      '(":home"
+        ":replies"
+        ":mentions"
+        ":direct_messages"))
 
 
 ;; -> END <-
@@ -202,3 +208,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)