[outshine] Proper outshine Setup

global.org

@@ -251,7 +251,8 @@
            (helm-mode . " η" )
            (smart-tab-mode . "")
            (subword-mode . "")
-           (outline-mode . " o")
+           (outshine-mode . " o")
+           (outline-minor-mode . "")
            (reftex-mode . "")
            (flyspell-mode . "")
            ;; Major modes
@@ -1092,7 +1093,7 @@
               (turn-on-auto-fill)
               (subword-mode)
               (TeX-fold-mode 1)
-              (outline-minor-mode)
+              (outshine-mode)
 
               ;; Move around commands in the Right Way™
               (modify-syntax-entry ?\\ "w" LaTeX-mode-syntax-table)
@@ -1274,13 +1275,12 @@
    #+END_SRC
 ** Outshine
   #+BEGIN_SRC emacs-lisp
-    (require 'outshine)
-    (add-hook 'outline-minor-mode-hook 'outshine-hook-function)
-    (setq outshine-use-speed-commands t)
     (defvar outline-minor-mode-prefix "\M-#")
-    (eval-after-load 'outshine
-    '(define-key outline-minor-mode-map (kbd "C-M-i") nil))
-    ;; (add-hook 'sh-mode-hook 'outline-minor-mode)
+    (setq outshine-use-speed-commands t)
+    (with-eval-after-load 'outshine
+      (define-key outshine-mode-map (kbd "C-M-i") nil))
+    (add-hook 'sh-mode-hook 'outshine-mode)
+    (require 'outshine)
   #+END_SRC
 ** helm
    #+BEGIN_SRC emacs-lisp