Merge branch 'master' into improve-comments

Conflicts:
	test/test-printing.el

1 files changed, 6 insertions, 0 deletions

diff --git a/sx-babel.el b/sx-babel.el
index 31c0924..7f84fe0 100644
--- a/sx-babel.el
+++ b/sx-babel.el
@@ -34,6 +34,12 @@
     ;; @TODO: Make shell-mode work here. Currently errors because it
     ;; needs a process. `sh-mode' isn't as nice.
     (,(rx (or "$ " "# ")) sh-mode)
+    ;; Not sure if leaving out "[{" might lead to false positives.
+    (,(rx "\\" (+ alnum) (any "[{")) latex-mode)
+    ;; Right now, this will match a lot of stuff. Once we are capable
+    ;; of determining major-mode from tags, site, and comments, this
+    ;; will work as a last case fallback.
+    (,(rx (or (and "int" (+ space) "main" (* space) "("))) c-mode)
     )
   "List of cons cells determining which major-mode to use when.
 Each car is a rule and each cdr is a major-mode.  The first rule