* textmodes/two-column.el (2C-split, 2C-merge):

* textmodes/bib-mode.el (bib-find-key, mark-bib):
* progmodes/idlw-shell.el (idlwave-shell-move-or-history):
* progmodes/etags.el (find-tag-in-order, etags-tags-apropos)
* progmodes/ada-xref.el (ada-get-all-references):
* obsolete/mlsupport.el (ml-next-line, ml-previous-line):
* emulation/vi.el (vi-previous-line-first-nonwhite)
(vi-effective-range, vi-put-before):
* emulation/edt.el (edt-next-line, edt-previous-line)
(edt-paragraph-forward): Use forward-line.

* progmodes/etags.el (tags-apropos): Require apropos at compile
time too.

* progmodes/prolog.el: Require comint when compiling.
(inferior-prolog-flavor): Move defvar before use.

1 files changed, 2 insertions, 2 deletions

diff --git a/lisp/textmodes/two-column.el b/lisp/textmodes/two-column.el
index e1f55c0dece..367a33a85b8 100644
--- a/lisp/textmodes/two-column.el
+++ b/lisp/textmodes/two-column.el
@@ -463,7 +463,7 @@ First column's text    sSs  Second column's text
 						 (1+ (point)))))
 	  (delete-region point (point))
 	  (setq n 0))
-	(next-line 1)))))
+	(forward-line 1)))))
 
 
 
@@ -531,7 +531,7 @@ off trailing spaces with \\[delete-trailing-whitespace]."
 	  (end-of-line)
 	  (indent-to-column 2C-window-width)
 	  (insert 2C-separator string))
-	(next-line 1)			; add one if necessary
+	(forward-line 1)		; add one if necessary
 	(set-buffer b2))))
   (unless (window-full-width-p)
     (enlarge-window 99999 t)))