 (setq ediff-window-setup-function 'ediff-setup-windows-plain)
 (add-to-list 'custom-theme-load-path "~/.emacs.d/themes/")
 
-(use-package badger-theme
-  :ensure t
-  :config
-  (progn
-    (load-theme 'badger t)
-    (set-face-attribute 'region nil :background "#555" :foreground "#ffffff")))
+;; (use-package badger-theme
+;;   :ensure t
+;;   :config
+;;   (progn
+;;     (load-theme 'badger t)
+;;     (set-face-attribute 'region nil :background "#555" :foreground "#ffffff")))
 
 (put 'scroll-left 'disabled nil)
 

(setq x-select-enable-clipboard t
      x-select-enable-primary t
      save-interprogram-paste-before-kill t)
	
(setq sentence-end-double-space nil)

(autoload 'zap-up-to-char "misc"

;;   (if (minibufferp)
;;       (minibuffer-complete)
;;     (if (or (not yas/minor-mode)
;;	    (null (do-yas-expand)))
;;	(if (check-expansion)
;;	    (company-complete-common)
;;	  (indent-for-tab-command)))))

(setq company-idle-delay 0.3)
(setq company-tooltip-limit 20)
