Merge branch 'master' of https://git.zom.bi/madmaurice/configfiles

emacs/.emacs

@@ -21,6 +21,9 @@
 		(height . 40)
 		))
 
+;; Use cperl-mode instead of perl-mode
+(defalias 'perl-mode 'cperl-mode)
+
 (defun silence ()
   (interactive))
 
@@ -51,7 +54,7 @@
  '(menu-bar-mode nil)
  '(package-selected-packages
    (quote
-	(shell-pop swiper neotree centered-cursor-mode ivy avy heroku-theme auto-complete use-package yasnippet evil-surround org evil-magit magit makefile-runner evil)))
+	(terminal-here shell-pop swiper neotree centered-cursor-mode ivy avy heroku-theme auto-complete use-package yasnippet evil-surround org evil-magit magit makefile-runner evil)))
  '(scroll-bar-mode nil)
  '(shell-pop-shell-type
    (quote
@@ -161,7 +164,14 @@
   :demand t
   :config (progn
 	    (require 'auto-complete-config)
-	    (ac-config-default)))
+		(setq ac-sources '(ac-source-filename
+						   ac-source-functions
+						   ac-source-yasnippet
+						   ac-source-variables
+						   ac-source-symbols
+						   ac-source-features
+						   ac-source-words-in-all-buffer
+						   ac-source-dictionary))))
 
 ;; ivy
 (use-package ivy