markdown: cleanup auto-modes for mmm and add support ini files

layers/+lang/markdown/README.org

@@ -77,6 +77,10 @@ list of `("language" "mode")`:
     (markdown :variables markdown-mmm-auto-modes '("c" "c++" "python" "scala" ("elisp" "emacs-lisp"))
 #+END_SRC
 
+*Note:* Spacemacs already defines the variable =markdown-mmm-auto-modes= to a
+bunch of languages. Consider opening a PR on the Spacemacs repository to add
+new languages instead of overriding the variable in your dotfile.
+
 * Usage
 ** Generate a TOC
 To generate a table of contents type on top of the buffer:

layers/+lang/markdown/config.el

@@ -15,5 +15,22 @@
   "Possibe values are `eww' (built-in browser) or `vmd' (installed with `npm').")
 
 (defvar markdown-mmm-auto-modes
-  '("c" "c++" "css" "java" "javascript" "python" "ruby" "rust" "scala" ("html" "web") ("elisp" "emacs-lisp") ("ess" "R"))
-  "List of language names or lists of language and mode names for which to generate mmm classes.")
+  '(
+    ;; in alphabetical order, symbols first then lists
+    "c"
+    "c++"
+    "css"
+    "java"
+    "javascript"
+    "python"
+    "ruby"
+    "rust"
+    "scala"
+
+    ("elisp" "emacs-lisp")
+    ("ess" "R")
+    ("ini" "conf-unix")
+    ("html" "web")
+    )
+  "List of language names or lists of language and mode names for which to
+generate mmm classes.")

layers/+lang/markdown/funcs.el

@@ -12,3 +12,24 @@
 (defun spacemacs/activate-mmm-mode ()
   ;; Enable `mmm-mode'.
   (mmm-mode 1))
+
+;; stolen from http://stackoverflow.com/a/26297700
+;; makes markdown tables saner via orgtbl-mode
+(defun spacemacs//cleanup-org-tables ()
+  (require 'org-table)
+  (save-excursion
+    (goto-char (point-min))
+    (while (search-forward "-+-" nil t) (replace-match "-|-"))))
+
+;; Insert key for org-mode and markdown a la C-h k
+;; from SE endless http://emacs.stackexchange.com/questions/2206/i-want-to-have-the-kbd-tags-for-my-blog-written-in-org-mode/2208#2208
+(defun spacemacs/insert-keybinding-markdown (key)
+  "Ask for a key then insert its description.
+Will work on both org-mode and any mode that accepts plain html."
+  (interactive "kType key sequence: ")
+  (let* ((tag "~%s~"))
+    (if (null (equal key "\r"))
+        (insert
+         (format tag (help-key-description key nil)))
+      (insert (format tag ""))
+      (forward-char -6))))

layers/+lang/markdown/packages.el

@@ -63,30 +63,8 @@
     :defer t
     :config
     (progn
-      ;; stolen from http://stackoverflow.com/a/26297700
-      ;; makes markdown tables saner via orgtbl-mode
-      (require 'org-table)
-      (defun cleanup-org-tables ()
-        (save-excursion
-          (goto-char (point-min))
-          (while (search-forward "-+-" nil t) (replace-match "-|-"))))
       (add-hook 'markdown-mode-hook 'orgtbl-mode)
-      (add-hook 'markdown-mode-hook
-                (lambda()
-                  (add-hook 'before-save-hook 'cleanup-org-tables  nil 'make-it-local)))
-      ;; Insert key for org-mode and markdown a la C-h k
-      ;; from SE endless http://emacs.stackexchange.com/questions/2206/i-want-to-have-the-kbd-tags-for-my-blog-written-in-org-mode/2208#2208
-      (defun spacemacs/insert-keybinding-markdown (key)
-        "Ask for a key then insert its description.
-Will work on both org-mode and any mode that accepts plain html."
-        (interactive "kType key sequence: ")
-        (let* ((tag "~%s~"))
-          (if (null (equal key "\r"))
-              (insert
-               (format tag (help-key-description key nil)))
-            (insert (format tag ""))
-            (forward-char -6))))
-
+      (add-hook 'markdown-mode-hook 'spacemacs//cleanup-org-tables nil 'local)
       ;; Declare prefixes and bind keys
       (dolist (prefix '(("mc" . "markdown/command")
                         ("mh" . "markdown/header")