fix(orgmode): use org-export-unravel-code to handle indentation

Author: gudzpoz

v8/orgmode/init.el

@@ -32,17 +32,6 @@
            (expand-file-name "macros.org" (file-name-directory load-file-name)))
         (org-macro--collect-macros)))
 
-;;; Code highlighting
-(defun org-html-decode-plain-text (text)
-  "Convert HTML character to plain TEXT. i.e. do the inversion of
-     `org-html-encode-plain-text`. Possible conversions are set in
-     `org-html-protect-char-alist'."
-  (mapc
-   (lambda (pair)
-     (setq text (replace-regexp-in-string (cdr pair) (car pair) text t t)))
-   (reverse org-html-protect-char-alist))
-  text)
-
 ;; Use pygments highlighting for code
 (defun pygmentize (lang code)
   "Use Pygments to highlight the given code and return the output"
@@ -64,7 +53,8 @@
     ("clojure" . "clojure")
     ("css" . "css")
     ("d" . "d")
-    ("emacs-lisp" . "scheme")
+    ("emacs-lisp" . "emacs-lisp")
+    ("elisp" . "elisp")
     ("F90" . "fortran")
     ("gnuplot" . "gnuplot")
     ("groovy" . "groovy")
@@ -98,20 +88,16 @@ See: http://orgmode.org/worg/org-contrib/babel/languages.html and
 http://pygments.org/docs/lexers/ for adding new languages to the mapping.")
 
 ;; Override the html export function to use pygments
-(defun org-html-src-block (src-block contents info)
+(define-advice org-html-src-block (:around (old-src-block src-block contents info))
   "Transcode a SRC-BLOCK element from Org to HTML.
 CONTENTS holds the contents of the item.  INFO is a plist holding
 contextual information."
-  (if (org-export-read-attribute :attr_html src-block :textarea)
-      (org-html--textarea-block src-block)
-    (let ((lang (org-element-property :language src-block))
-          (code (org-element-property :value src-block))
-          (code-html (org-html-format-code src-block info)))
-      (if nikola-use-pygments
-          (progn
-            (unless lang (setq lang ""))
-            (pygmentize (downcase lang) (org-html-decode-plain-text code)))
-        code-html))))
+  (if (or (not nikola-use-pygments)
+          (org-export-read-attribute :attr_html src-block :textarea))
+      (funcall old-src-block src-block contents info)
+    (let ((lang (or (org-element-property :language src-block) ""))
+          (code (car (org-export-unravel-code src-block))))
+      (pygmentize (downcase lang) code))))
 
 ;; Export images with custom link type
 (defun org-custom-link-img-url-export (path desc format)
@@ -129,12 +115,12 @@ contextual information."
 
 ;; Support for magic links (link:// scheme)
 (org-link-set-parameters
-  "link"
-  :export (lambda (path desc backend)
-             (cond
-               ((eq 'html backend)
-                (format "<a href=\"link:%s\">%s</a>"
-                        path (or desc path))))))
+ "link"
+ :export (lambda (path desc backend)
+           (cond
+            ((eq 'html backend)
+             (format "<a href=\"link:%s\">%s</a>"
+                     path (or desc path))))))
 
 ;; Export function used by Nikola.
 (defun nikola-html-export (infile outfile)