(outline-end-of-subtree): Stop before final newline.

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