(outline-end-of-subtree): If loop leaves us at eob,

don't move back from there.

diff --git a/lisp/textmodes/ooutline.el b/lisp/textmodes/ooutline.el
index b9e9dd3524dcfdcd400d9b7b8741c294ad41ad4e..efd49c9f41acae483b8cd1f567f66f6a282b2dbe 100644 (file)
--- a/lisp/textmodes/ooutline.el
+++ b/lisp/textmodes/ooutline.el
@@ -352,9 +352,13 @@ while if FLAG is `\\^M' (control-M) the text is hidden."
                (or first (> (funcall outline-level) level)))
       (setq first nil)
       (outline-next-heading))
-    (forward-char -1)
-    (if (memq (preceding-char) '(?\n ?\^M))
-       (forward-char -1))))
+    (if (eobp)
+       nil
+      ;; go to end of line before heading
+      (forward-char -1)
+      ;; skip preceding balnk line, if there is one
+      (if (memq (preceding-char) '(?\n ?\^M))
+         (forward-char -1)))))
 \f
 (defun show-branches ()
   "Show all subheadings of this heading, but not their bodies."