summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2017-12-04 08:24:19 +0100
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2017-12-04 08:24:19 +0100
commit0c691737aadfe645a2bb4891e206f6340c9ed6c0 (patch)
tree9deb27c453ba584238186262e9f9ec20eae857c9
parenta0e3f1d5050ffd0d03c68b35b2b5300fb89da1f0 (diff)
parente22ee8b8a39933c8d662894a3b96b07337c4f536 (diff)
downloadorg-mode-0c691737aadfe645a2bb4891e206f6340c9ed6c0.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/ox-html.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/ox-html.el b/lisp/ox-html.el
index 0e22c16..90a6ced 100644
--- a/lisp/ox-html.el
+++ b/lisp/ox-html.el
@@ -2202,7 +2202,7 @@ https://github.com/hniksic/emacs-htmlize"))
(org-html-htmlize-region-for-paste
(point-min) (point-max))))))
;; Strip any enclosing <pre></pre> tags.
- (let* ((beg (and (string-match "\\`<pre[^>]*>\n*" code) (match-end 0)))
+ (let* ((beg (and (string-match "\\`<pre[^>]*>\n?" code) (match-end 0)))
(end (and beg (string-match "</pre>\\'" code))))
(if (and beg end) (substring code beg end) code)))))))))
@@ -2215,7 +2215,7 @@ alist between line numbers and references (as returned by
`org-export-unravel-code'), a boolean specifying if labels should
appear in the source code, and the number associated to the first
line of code."
- (let* ((code-lines (org-split-string code "\n"))
+ (let* ((code-lines (split-string code "\n"))
(code-length (length code-lines))
(num-fmt
(and num-start