[nongnu] elpa/evil-matchit 18a3e6ab47 096/244: Merge pull request #64 from hlissner/master

[ELPA Syncer]

branch: elpa/evil-matchit
commit 18a3e6ab47d875e83614cdb7351f227e69e9ce84
Merge: 98c045d352 94e359e30c
Author: chen bin <chenbin.sh@gmail.com>
Commit: chen bin <chenbin.sh@gmail.com>

    Merge pull request #64 from hlissner/master
    
    Fix embedded major-mode detection in org-mode
---
 evil-matchit-org.el | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/evil-matchit-org.el b/evil-matchit-org.el
index 1956758278..a97c03ffdc 100644
--- a/evil-matchit-org.el
+++ b/evil-matchit-org.el
@@ -49,17 +49,9 @@ between '\\(' and '\\)' in regular expression.
     ))
 
 (defun evilmi--get-embedded-language-major-mode ()
-  (let ((info (org-edit-src-find-region-and-lang))
-        lang
-        lang-f)
-    (if info
-        (progn
-          (setq lang (or (cdr (assoc (nth 2 info) org-src-lang-modes))
-                         (nth 2 info)))
-          (setq lang (if (symbolp lang) (symbol-name lang) lang))
-          (setq lang-f (intern (concat lang "-mode")))
-          ))
-    lang-f))
+  (let ((lang (org-element-property :language (org-element-at-point))))
+    (when lang
+      (intern (concat lang "-mode")))))
 
 ;;;###autoload
 (defun evilmi-org-get-tag ()