Modify Bastien's emphasis in verse fix

Instead of making the postmatch optional, we allow backslash in the
postmatch string, so that the match will work before an explicit line
break "\\".

lisp/ChangeLog

@@ -2,6 +2,9 @@
 
 	* org.el (org-read-date): Make sure the calendar is in the current
 	frame.
+	(org-set-emph-re): Remove the ? from the post-match.
+	(org-emphasis-regexp-components): Add backslash to the
+	postmatch class.
 
 	* org-table.el (org-table-error-on-row-ref-crossing-hline):
 	Variable made obsolete.

lisp/org.el

@@ -2744,7 +2744,7 @@ org-leve-* faces."
 		    "[^" border "]"
 		    "\\)"
 		    "\\3\\)"
-		    "\\([" post "]\\|$\\)?"))
+		    "\\([" post "]\\|$\\)"))
       (setq org-verbatim-re
 	    (concat "\\([" pre "]\\|^\\)"
 		    "\\("
@@ -2756,10 +2756,10 @@ org-leve-* faces."
 		    "[^" border "]"
 		    "\\)"
 		    "\\3\\)"
-		    "\\([" post  "]\\|$\\)?")))))
+		    "\\([" post  "]\\|$\\)")))))
 
 (defcustom org-emphasis-regexp-components
-  '(" \t('\"{" "- \t.,:!?;'\")}" " \t\r\n,\"'" "." 1)
+  '(" \t('\"{" "- \t.,:!?;'\")}\\" " \t\r\n,\"'" "." 1)
   "Components used to build the regular expression for emphasis.
 This is a list with 6 entries.  Terminology:  In an emphasis string
 like \" *strong word* \", we call the initial space PREMATCH, the final