From 64a5f9a59602f234febeb9ec2391e71e26d17fb4 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 8 Mar 2017 00:12:55 +0100
Subject: [PATCH] ox-html: Fix verse blocks

* lisp/ox-html.el (org-html-verse-block): Add missing line break at
  the end of each line in verse environments.

Reported-by: Skip Collins <skip.collins@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/112537>
---
 lisp/ox-html.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/ox-html.el b/lisp/ox-html.el
index 0db5a66b6..6ff487bdb 100644
--- a/lisp/ox-html.el
+++ b/lisp/ox-html.el
@@ -3600,8 +3600,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
-- 
2.11.4.GIT