Commit 5cb676775629

@@ -236,8 +236,7 @@ Otherwise, use `projectile-switch-to-project'."
 ;; Same for clang, cmake or xcode, elisp
 
 (use-package company-emoji
-  :hook ((org-mode . my-company-emoji)
-         (markdown-mode . my-company-emoji))
+  :hook ((markdown-mode . my-company-emoji))
   :config
   (defun my-company-emoji ()
     (set (make-local-variable 'company-backends) '(company-emoji))
@@ -245,7 +244,7 @@ Otherwise, use `projectile-switch-to-project'."
 
 ;; -UseCompany
 
-
+;; Deprecated for now
 (use-package ivy
   :disabled
   :bind (("C-x B" . ivy-switch-buffer)

@@ -40,6 +40,7 @@
 ;; MessageCfg
 (use-package message
   :commands (message-mode message-cite-original-without-signature)
+  :hook ((message-mode . my-message-hook))
   :config
   (setq mail-user-agent 'message-user-agent
         message-wide-reply-confirm-recipients t
@@ -48,7 +49,12 @@
         message-kill-buffer-on-exit t
         message-generate-headers-first t)
   (add-to-list 'mm-body-charset-encoding-alist '(utf-8 . base64))
-  (add-hook 'message-mode-hook 'turn-on-auto-fill))
+  (defun my-message-hook ()
+    "Message mode hook."
+    (turn-on-auto-fill)
+    (set (make-local-variable 'company-backends)
+         '(company-emoji company-capf company-files company-dabbrev))
+    (company-mode 1)))
 ;; -MessageCfg
 
 ;; Notmuch

@@ -112,6 +112,9 @@
     (auto-revert-mode)
     (auto-fill-mode)
     (org-indent-mode)
+    (set (make-local-variable 'company-backends)
+         '(company-emoji company-capf company-files company-dabbrev))
+    (company-mode 1)
     (add-hook 'after-save-hook #'save-and-update-includes nil 'make-it-local)))
 ;; -OrgHook