Merge remote-tracking branch 'refs/remotes/origin/master'

1 files changed, 3 insertions, 16 deletions

diff --git a/emacs/init.el b/emacs/init.el
index 337d6630..c26f3e24 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -311,7 +311,8 @@ Values: `desktop', `server', `laptop'")
   :bind (("C-<tab>" . company-complete))
   :init (progn
           (add-hook 'prog-mode-hook #'company-mode)
-          (setq company-idle-delay .3)))
+          (setq company-idle-delay .3
+                company-begin-commands '(self-insert-command))))
 
 ;;;; Dates & Times
 
@@ -497,12 +498,12 @@ Values: `desktop', `server', `laptop'")
 (unbind-key "C-x C-c")
 
 (bind-key "C-c i" #'ucs-insert)
+(bind-key "M-/" #'hippie-expand)
 
 (unbind-key "s-h")
 (unbind-key "s-n")
 (unbind-key "s-p")
 (unbind-key "s-w")
-(unbind-key "s-m")
 
 (bind-key "s-x" (define-prefix-command 'super-x-map))
 
@@ -1139,20 +1140,6 @@ Works with: arglist-cont-nonempty, arglist-close."
   :ensure t
   :mode (("\\.j2\\'" . jinja2-mode)))
 
-(use-package nxhtml-mode
-  :defer t
-  :if (eq env/system-type 'laptop)
-  :load-path "nxhtml"
-  :config (progn
-            (when (and (equal emacs-major-version 24)
-                       (> emacs-minor-version 1))
-              (setq mumamo-per-buffer-local-vars
-                    (delq 'buffer-file-name mumamo-per-buffer-local-vars)))
-            (setq mumamo-chunk-coloring 4
-                  nxhtml-skip-welcome t
-                  nxhtml-autoload-web nil)
-            (nxhtml-menu-mode -1)))
-
 (use-package php-mode
   :mode ("\\.php\\'" . php-mode)
   :config (progn