Explorar el Código

Join separate lists created in HTML by headlines below the headline limit.
This bug was reported by Adam Spiers.

Carsten Dominik hace 18 años
padre
commit
73dc3b4761
Se han modificado 2 ficheros con 8 adiciones y 2 borrados
  1. 3 0
      ChangeLog
  2. 5 2
      org.el

+ 3 - 0
ChangeLog

@@ -2,6 +2,9 @@
 
 	* org.el (org-make-tags-matcher): Allow "" to match an empty or
 	non-existent property value.
+	(org-export-as-html): Join unsorted lists when they directly
+	follow each other.  Such lists may be created by headlines that
+	are converted to lists.
 
 2008-02-12  Bastien Guerry  <bzg@altern.org>
 

+ 5 - 2
org.el

@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 5.21
+;; Version: 5.21+
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -84,7 +84,7 @@
 
 ;;; Version
 
-(defconst org-version "5.21"
+(defconst org-version "5.21+"
   "The version number of the file org.el.")
 
 (defun org-version (&optional here)
@@ -25477,6 +25477,9 @@ lang=\"%s\" xml:lang=\"%s\">
       (goto-char (point-min))
       (while (re-search-forward "<li>[ \r\n\t]*</li>\n?" nil t)
 	(replace-match ""))
+      (goto-char (point-min))
+      (while (re-search-forward "</ul>\\s-*<ul>\n?" nil t)
+	(replace-match ""))
       ;; Convert whitespace place holders
       (goto-char (point-min))
       (let (beg end n)