... are attached.  I've run with this for a few weeks now, and what I
use mostly works.  So I would appreciate if these could go into the git
repo.

Let me draw your attention to this hunk:

--- a/lisp/org.el
+++ b/lisp/org.el
@@ -7360,7 +7360,7 @@ would end up with no indentation after the change, nothing at all is done."
 	   col)
       (while (re-search-forward
 	      (concat "\\(" (regexp-opt org-all-time-keywords)
-		      "\\|" "^[ \t]*" org-tsr-regexp-both "*$"
+		      "\\|" "^[ \t]*" org-tsr-regexp-both "$"
 		      "\\|" "^[ \t]*:[a-zA-Z][a-zA-Z0-9_]*:.*$"
 		      "\\)") (or drawer-end end) t)
 	(beginning-of-line)

While I needed this to make the code run on XEmacs, it really looks like
a bug fix to me: The "*" that I deleted makes that part of the
disjunction match the empty string, and that makes
`org-fixup-indentation' loop infinitely.

-- 
Cheers =8-} Mike
Friede, Völkerverständigung und überhaupt blabla