Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode

2 files changed, 7 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0cf7d21..6bd5c54 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-07  Andreas Burtzlaff <andy13@gmx.net>  (tiny change)
+
+	* org.el (outline-end-of-subtree): Bugfix: advise this function in
+	a way that prevents any trailing character from being displayed.
+
 2009-09-07  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* org-agenda.el (org-agenda-menu): Fix bugs in the bulk action
diff --git a/lisp/org.el b/lisp/org.el
index 66879e1..b58cacc 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -172,7 +172,7 @@ and loading it will require that you have downloaded and properly installed
 the org-mode distribution.
 
 You can also use this system to load external packages (i.e. neither Org
-core modules, not modules from the CONTRIB directory).  Just add symbols
+core modules, nor modules from the CONTRIB directory).  Just add symbols
 to the end of the list.  If the package is called org-xyz.el, then you need
 to add the symbol `xyz', and the package must have a call to
 
@@ -16880,7 +16880,7 @@ If there is no such heading, return nil."
   (if (eq major-mode 'org-mode)
       (progn
 	(org-end-of-subtree nil t)
-	(backward-char 1))
+	(unless (eobp) (backward-char 1)))
     ad-do-it))
 
 (defun org-forward-same-level (arg &optional invisible-ok)