diff options
| author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2017-03-08 00:15:26 +0100 |
|---|---|---|
| committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2017-03-08 00:15:26 +0100 |
| commit | 2f48603d7130f5a5dfe3785e7fff8994c5ca186d (patch) | |
| tree | 9c1a2d6c9b30f836032b1ddf6a19d71ba6502e6e | |
| parent | 38b372e14360349daae0a5ebde82c52475efb117 (diff) | |
| parent | 64a5f9a59602f234febeb9ec2391e71e26d17fb4 (diff) | |
| download | org-mode-2f48603d7130f5a5dfe3785e7fff8994c5ca186d.tar.gz | |
Merge branch 'maint'
| -rw-r--r-- | lisp/ox-html.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/ox-html.el b/lisp/ox-html.el index 0ca19ef..1be0271 100644 --- a/lisp/ox-html.el +++ b/lisp/ox-html.el @@ -3601,8 +3601,8 @@ contextual information." ;; remove any trailing "br" close-tag so as to avoid ;; duplicates. (let* ((br (org-html-close-tag "br" nil info)) - (re (format "\\(%s\\)[ \t]*$" (regexp-quote br)))) - (replace-regexp-in-string re br contents))))) + (re (format "\\(?:%s\\)?[ \t]*\n" (regexp-quote br)))) + (replace-regexp-in-string re (concat br "\n") contents))))) ;;; Filter Functions |