* 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.

4 files changed, 15 insertions, 15 deletions

diff --git a/lisp/progmodes/ada-xref.el b/lisp/progmodes/ada-xref.el
index c37d11910d4..ddea4c293df 100644
--- a/lisp/progmodes/ada-xref.el
+++ b/lisp/progmodes/ada-xref.el
@@ -1706,7 +1706,7 @@ Information is extracted from the ali file."
 	    (beginning-of-line)
 	    ;; while we have a continuation line, go up one line
 	    (while (looking-at "^\\.")
-	      (previous-line 1)
+	      (forward-line -1)
 	      (beginning-of-line))
 	    (unless (looking-at (concat "[0-9]+.[0-9]+[ *]"
 					(ada-name-of identlist) "[ <{=\(\[]"))
@@ -1735,11 +1735,11 @@ Information is extracted from the ali file."
 	(let ((current-line (buffer-substring
 			     (point) (save-excursion (end-of-line) (point)))))
 	  (save-excursion
-	    (next-line 1)
+	    (forward-line 1)
 	    (beginning-of-line)
 	    (while (looking-at "^\\.\\(.*\\)")
 	      (set 'current-line (concat current-line (match-string 1)))
-	      (next-line 1))
+	      (forward-line 1))
 	    )
 
 	  (if (re-search-backward "^X [0-9]+ \\([a-zA-Z0-9_.-]+\\)" nil t)
diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el
index 4148f327ecc..275773049e7 100644
--- a/lisp/progmodes/etags.el
+++ b/lisp/progmodes/etags.el
@@ -1130,7 +1130,7 @@ where they were found."
 		  (if (memq (car order) '(tag-exact-file-name-match-p
 					  tag-file-name-match-p
 					  tag-partial-file-name-match-p))
-                      (save-excursion (next-line 1)
+                      (save-excursion (forward-line 1)
                                       (file-of-tag))
                     (file-of-tag)))
 	    tag-info (funcall snarf-tag-function))
@@ -1454,10 +1454,10 @@ where they were found."
 	     (tag-info (save-excursion (funcall snarf-tag-function)))
 	     (tag (if (eq t (car tag-info)) nil (car tag-info)))
 	     (file-path (save-excursion (if tag (file-of-tag)
-					  (save-excursion (next-line 1)
+					  (save-excursion (forward-line 1)
 							  (file-of-tag)))))
 	     (file-label (if tag (file-of-tag t)
-			   (save-excursion (next-line 1)
+			   (save-excursion (forward-line 1)
 					   (file-of-tag t))))
 	     (pt (with-current-buffer standard-output (point))))
 	(if tag
@@ -1884,7 +1884,7 @@ directory specification."
 	  (funcall tags-apropos-function regexp))))
     (etags-tags-apropos-additional regexp))
   (with-current-buffer "*Tags List*"
-    (require 'apropos)
+    (eval-and-compile (require 'apropos))
     (apropos-mode)
     ;; apropos-mode is derived from fundamental-mode and it kills
     ;; all local variables.
diff --git a/lisp/progmodes/idlw-shell.el b/lisp/progmodes/idlw-shell.el
index 4d2dd7f315e..eebfd377a7e 100644
--- a/lisp/progmodes/idlw-shell.el
+++ b/lisp/progmodes/idlw-shell.el
@@ -1474,7 +1474,7 @@ Otherwise just move the line.  Move down unless UP is non-nil."
     (if (and idlwave-shell-arrows-do-history
 	     (>= (1+ (save-excursion (end-of-line) (point))) proc-pos))
 	(comint-previous-input arg)
-      (previous-line arg))))
+      (forward-line (- arg)))))
 
 (defun idlwave-shell-up-or-history (&optional arg)
 "When in last line of process buffer, move to previous input.
diff --git a/lisp/progmodes/prolog.el b/lisp/progmodes/prolog.el
index 7cff1bc516e..470988f4c14 100644
--- a/lisp/progmodes/prolog.el
+++ b/lisp/progmodes/prolog.el
@@ -31,7 +31,7 @@
 
 ;;; Code:
 
-(defvar comint-prompt-regexp)
+(eval-when-compile (require 'comint))
 
 
 (defgroup prolog nil
@@ -269,6 +269,12 @@ Return not at end copies rest of line to end and sends it.
 
 (defvar inferior-prolog-buffer nil)
 
+(defvar inferior-prolog-flavor 'unknown
+  "Either a symbol or a buffer position offset by one.
+If a buffer position, the flavor has not been determined yet and
+it is expected that the process's output has been or will
+be inserted at that position plus one.")
+
 (defun inferior-prolog-run (&optional name)
   (with-current-buffer (make-comint "prolog" (or name prolog-program-name))
     (inferior-prolog-mode)
@@ -302,12 +308,6 @@ Return not at end copies rest of line to end and sends it.
         ;; Try again.
         (inferior-prolog-process))))
 
-(defvar inferior-prolog-flavor 'unknown
-  "Either a symbol or a buffer position offset by one.
-If a buffer position, the flavor has not been determined yet and
-it is expected that the process's output has been or will
-be inserted at that position plus one.")
-
 (defun inferior-prolog-guess-flavor (&optional ignored)
   (save-excursion
     (goto-char (1+ inferior-prolog-flavor))