X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Fconfig%2Finit-base.el;h=6773f70e52ff937d7912b9b13deda27509e29ccf;hb=03fe4ca3c2afdbeb973c9d9c0afeed2b55fd212a;hp=5a4d64ab5f5c8d830aa1585ea5b865cb9c3d5f61;hpb=1508bdd3e5e0117394d06787e4d8b9c9febacf73;p=dotfiles.git

diff --git a/emacs.d/config/init-base.el b/emacs.d/config/init-base.el
index 5a4d64a..6773f70 100644
--- a/emacs.d/config/init-base.el
+++ b/emacs.d/config/init-base.el
@@ -6,7 +6,8 @@
 (add-to-list 'default-frame-alist '(width  . 120))
 (add-to-list 'default-frame-alist '(height . 40))
 ;(add-to-list 'default-frame-alist '(font . "Source Code Pro for Powerline-12:weight:light" ))
-(add-to-list 'default-frame-alist '(font . "Source Code Pro for Powerline-12" ))
+;(add-to-list 'default-frame-alist '(font . "Source Code Pro for Powerline-12" ))
+
 (setq inhibit-startup-message t)
 
 (put 'set-goal-column 'disabled nil)
@@ -28,8 +29,11 @@
 
 (set-face-attribute 'vertical-border nil  :foreground "gray")
 
+(defalias 'yes-or-no-p 'y-or-n-p)
 
-
+(setq scroll-margin 5)
+(setq scroll-conservatively 10000)
+(show-paren-mode t)
 
 
 (provide 'init-base)