From: rasmus <rasmus@gmx.us>
Date: Sat, 13 Jul 2013 14:30:04 +0000 (+0200)
Subject: Better C++ recognition
X-Git-Tag: release_8.1~17^2~60
X-Git-Url: https://repo.or.cz/w/org-mode.git/commitdiff_plain/6727f1aa755a819a92d34ce7f09b0f8327d6a9b3

Better C++ recognition

* ob-C.el: Added =C++= to =`org-babel-load-languages'=
automatically after loading =C=.
* org-src.el (org-src-lang-modes): Added association between
language =C++= and =`c++-mode'=.

=C++= is added to org-babel-load-languages to make
`org-babel-demarcate-block' recognize =C++= as a proper language.
---

diff --git a/lisp/ob-C.el b/lisp/ob-C.el
index e9eec934d..b0eaf6f9f 100644
--- a/lisp/ob-C.el
+++ b/lisp/ob-C.el
@@ -39,6 +39,8 @@
 
 (defvar org-babel-tangle-lang-exts)
 (add-to-list 'org-babel-tangle-lang-exts '("C++" . "cpp"))
+(let ((x (member '(C . t) org-babel-load-languages)))
+  (setcdr x  (cons '(C++ . t) (subseq x 1))))
 
 (defvar org-babel-default-header-args:C '())
 
diff --git a/lisp/org-src.el b/lisp/org-src.el
index 81b8e4053..0f881740b 100644
--- a/lisp/org-src.el
+++ b/lisp/org-src.el
@@ -179,7 +179,7 @@ but which mess up the display of a snippet in Org exported files.")
 (defcustom org-src-lang-modes
   '(("ocaml" . tuareg) ("elisp" . emacs-lisp) ("ditaa" . artist)
     ("asymptote" . asy) ("dot" . fundamental) ("sqlite" . sql)
-    ("calc" . fundamental) ("C" . c) ("cpp" . c++)
+    ("calc" . fundamental) ("C" . c) ("cpp" . c++) ("C++" . c++)
     ("screen" . shell-script))
   "Alist mapping languages to their major mode.
 The key is the language name, the value is the string that should