Modify scroll behavior

behavior.el

@@ -60,10 +60,9 @@
 (setq redisplay-dont-pause t
       mouse-wheel-scroll-amount '(1 ((shift) . 10)) ;; one line at a time
       mouse-wheel-follow-mouse 't ;; scroll window under mouse
-      scroll-margin 3
+      scroll-margin 4
       scroll-step 1
-      scroll-conservatively 10000
-      scroll-preserve-screen-position 1)
+      scroll-conservatively 10000)
 
 ;; Enable mouse support when running in a console
 (unless window-system

custom-variables.el

@@ -113,7 +113,6 @@
  '(projectile-globally-ignored-files (quote ("TAGS" "*.log")))
  '(ruby-use-encoding-map nil)
  '(safe-local-variable-values (quote ((eval rainbow-mode 1))))
- '(scroll-margin 4)
  '(scss-compile-at-save nil)
  '(search-exit-option nil)
  '(smooth-scroll-margin 6)