Small essentials

Conflicts:
	init.el

init.el

@@ -37,7 +37,8 @@
 (setq-default indent-tabs-mode nil)
 
 ;;;; Fix scrolling
-(setq scroll-conservatively 10000)
+(setq scroll-conservatively 10000
+      scroll-preserve-screen-position t)
 (setq auto-window-vscroll nil)
 
 ;;; Recenter screen on isearch matches
@@ -296,9 +297,9 @@
 ;(require 'zlc)
 ;(zlc-mode t)
 
-;;;; Session.el
-(require 'session)
-(add-hook 'after-init-hook 'session-initialize)
+;;;; Ediff stuff
+(setq ediff-window-setup-function 'ediff-setup-windows-plain)
+
 ;;;; ERC
 ;(setq erc-log-channels-directory "~/.emacs.d/erc/logs/")
 ;(setq erc-log-write-after-insert t)
@@ -310,6 +311,10 @@
 ;(erc-fill-mode -1)
 ;(add-hook 'erc-join-hook (lambda () (erc-fill-mode -1)))
 
+;;;; fullscreen-mode
+(require 'fullscreen-mode)
+(fullscreen-mode 1)
+
 
 ;;;; recentf
 (require 'recentf)
@@ -319,14 +324,15 @@
 (setq recentf-save-file "/home/anon/.emacs.d/recentf")
 (global-set-key "\C-x\ \C-r" 'recentf-open-files)
 
+;;;; Session.el
+(require 'session)
+(add-hook 'after-init-hook 'session-initialize)
+
+
+
 ;;;; text size change
 (set-face-attribute 'default nil :font "-outline-Bitstream Vera Sans Mono-normal-normal-normal-mono-12-*-*-*-c-*-iso8859-1")
 
-;;;; Ediff stuff
-(setq ediff-window-setup-function 'ediff-setup-windows-plain)
-
-
-
 ;;;; Win-switch
 (require 'win-switch)
 (global-set-key "\C-xo" 'win-switch-dispatch)
@@ -335,9 +341,6 @@
 (setq win-switch-other-window-first nil)
 ;(setq win-switch-other-window-first nil)
 
-;;;; fullscreen-mode
-(require 'fullscreen-mode)
-(fullscreen-mode 1)
 
 ;;;; yafolding.el
 ;(add-hook 'prog-mode-hook