diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 48774e38958..24be4370154 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,8 @@
 
 	* textmodes/artist.el (artist-previous-line, artist-next-line):
 	* dired.el (dired-next-line, dired-previous-line):
+	* progmodes/delphi.el (delphi-newline):
+	* textmodes/org.el (org-columns-eval):
 	Use forward-line.
 
 2007-10-18  Juanma Barranquero  <lekktu@gmail.com>
diff --git a/lisp/textmodes/org.el b/lisp/textmodes/org.el
index 626d8c63395..5487609343b 100644
--- a/lisp/textmodes/org.el
+++ b/lisp/textmodes/org.el
@@ -15050,8 +15050,7 @@ Where possible, use the standard interface for changing this line."
 (defun org-columns-eval (form)
   (let (hidep)
     (save-excursion
-      (beginning-of-line 1)
-      (next-line 1)
+      (forward-line 1)
       (setq hidep (org-on-heading-p 1)))
     (eval form)
     (and hidep (hide-entry))))