ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2017-03-08 00:15:26 +01:00
parent 38b372e143 64a5f9a596
commit 2f48603d71
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/ox-html.el
View File

@ -3601,8 +3601,8 @@ contextual information."
;; remove any trailing "br" close-tag so as to avoid ;; remove any trailing "br" close-tag so as to avoid
;; duplicates. ;; duplicates.
(let* ((br (org-html-close-tag "br" nil info)) (let* ((br (org-html-close-tag "br" nil info))
(re (format "\\(%s\\)[ \t]*$" (regexp-quote br)))) (re (format "\\(?:%s\\)?[ \t]*\n" (regexp-quote br))))
(replace-regexp-in-string re br contents))))) (replace-regexp-in-string re (concat br "\n") contents)))))
;;; Filter Functions ;;; Filter Functions