summary refs log tree commit diff stats
path: root/emacs
diff options
context:
space:
mode:
Diffstat (limited to 'emacs')
-rw-r--r--emacs/init.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/emacs/init.el b/emacs/init.el
index 6a4a121..bb701b5 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -1009,7 +1009,7 @@ Also returns nil if pid is nil."
   :config (use-package quack))
 
 (use-package slime
-  :commands (slime)
+    :commands (slime)
   :config (progn
             (let ((ql-slime-helper (expand-file-name "~/quicklisp/slime-helper.el")))
               (if (file-exists-p ql-slime-helper)
@@ -1065,7 +1065,7 @@ Also returns nil if pid is nil."
   :init (progn
           (add-hook 'c-mode-common-hook #'electric-indent-mode))
   :config (progn
-            (setq c-default-style '((java-mode . "java")
+              (setq c-default-style '((java-mode . "java")
                                     (awk-mode . "awk")
                                     (other . "k&r"))
                   c-basic-offset 4)
@@ -1148,6 +1148,7 @@ Also returns nil if pid is nil."
                  "%b"))))
 
 (setq scroll-conservatively 100 ; Keep the cursor position when scrolling
+      scroll-margin 1
       scroll-preserve-screen-position nil)
 
 (when menu-bar-mode