       python-mode-hook '(lambda () (progn
 				     (set-variable 'py-indent-offset 4)
 				     (set-variable 'indent-tabs-mode nil))))
-
-;; (eval-after-load 'company
-;;   (progn
-;;     (define-key company-active-map (kbd "TAB") nil)
-;;     (define-key company-active-map [tab] nil)))
 
 (use-package company
   :ensure company)

  (let ((yas/fallback-behavior 'return-nil))
    (yas/expand)))

;; (defun tab-indent-or-complete ()
;;   (interactive)
;;   (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)
(setq company-minimum-prefix-length 2)

(setq ediff-window-setup-function 'ediff-setup-windows-plain)
(add-to-list 'custom-theme-load-path "~/.emacs.d/themes/")

(put 'scroll-left 'disabled nil)

(load-library "python")
