From d027e718398b1f03644ac74bfbd1575a4e09845b Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 20 Nov 2012 18:53:28 +0100
Subject: .emacs.d/init.el

---
 .emacs.d/init.el | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to '.emacs.d/init.el')

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 6b20d31..ee23d0d 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -106,9 +106,6 @@
   '(setq ido-ignore-buffers `(,@ido-ignore-buffers
                               "^\\*.*\\*$" "^irc\\." "^\\#")))
 
-(eval-after-load "info"
-  '(require 'info+))
-
 (eval-after-load "jabber"
   '(remove-hook 'jabber-alert-presence-hooks 'jabber-presence-echo))
 
@@ -273,9 +270,10 @@
 (setq php-function-call-face 'font-lock-function-name-face)
 (setq php-mode-force-pear t)
 (setq pony-tpl-indent-moves t)
+(setq pp^L-^L-string-function 'oni:pretty-control-l-function)
+(setq pp^L-^L-string-pre nil)
 (setq rainbow-delimiters-max-face-count 12)
 (setq redisplay-dont-pause t)
-(setq scroll-conservatively 101)
 (setq send-mail-function 'smtpmail-send-it)
 (setq sendmail-program "/usr/bin/msmtp")
 (setq smex-key-advice-ignore-menu-bar t)
-- 
cgit v1.2.3-54-g00ecf