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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cba2388afd90895baa1f7d6ba9d4588212cf62d6..f88bd4df16565f9f5bf4a323b7364f276a96c2a2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,22 @@
+2007-10-19  Dan Nicolaescu  <dann@ics.uci.edu>
+
+       * 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.
+
 2007-10-19  Richard Stallman  <rms@gnu.org>
 
        * font-core.el (turn-on-font-lock-if-desired):

diff --git a/lisp/emulation/edt.el b/lisp/emulation/edt.el
index 44067dba1f24915e8051db9868e42d318a827f4b..bff1a583586037fc27338fe27c23bd18469fa660 100644 (file)
--- a/lisp/emulation/edt.el
+++ b/lisp/emulation/edt.el
@@ -649,7 +649,7 @@ Argument NUM is the number of lines to move."
   (interactive "p")
   (edt-check-prefix num)
   (let ((beg (edt-current-line)))
-    (next-line num)
+    (forward-line num)
     (edt-bottom-check beg num))
   (if edt-x-emacs19-p (setq zmacs-region-stays t)))
 
@@ -659,7 +659,7 @@ Argument NUM is the number of lines to move."
   (interactive "p")
   (edt-check-prefix num)
   (let ((beg (edt-current-line)))
-    (previous-line num)
+    (forward-line (- num))
     (edt-top-check beg num))
   (if edt-x-emacs19-p (setq zmacs-region-stays t)))
 
@@ -1426,7 +1426,7 @@ Argument NUM is the positive number of paragraphs to move."
       (forward-paragraph (+ num 1))
       (start-of-paragraph-text)
       (if (eolp)
-         (next-line 1))
+         (forward-line 1))
       (setq num (1- num)))
     (cond((> (point) far)
          (setq left (save-excursion (forward-line height)))

diff --git a/lisp/emulation/vi.el b/lisp/emulation/vi.el
index 977a798080331addef4db5dc01866b5490d5e452..81ad04b60d9f828ff8f6a7d2d77d88845a791209 100644 (file)
--- a/lisp/emulation/vi.el
+++ b/lisp/emulation/vi.el
@@ -801,7 +801,7 @@ The given COUNT is remembered for future scrollings."
 (defun vi-previous-line-first-nonwhite (count)
   "Go up COUNT lines.  Stop at first non-white."
   (interactive "p")
-  (previous-line count)
+  (forward-line (- count))
   (back-to-indentation))
 
 (defun vi-scroll-up-window (count)
@@ -1062,7 +1062,7 @@ MOTION-COMMAND with ARG.
               (setq end (1+ end)))
              ((eq moving-unit 'line)
               (goto-char begin) (beginning-of-line) (setq begin (point))
-              (goto-char end) (next-line 1) (beginning-of-line) (setq end (point))))
+              (goto-char end) (forward-line 1) (beginning-of-line) (setq end (point))))
        (if (> end (point-max)) (setq end (point-max))) ; force in buffer region
        (cons begin end)))))
 
@@ -1124,7 +1124,7 @@ text as lines.  If the optional after-p is given, put after/below the cursor."
             (t (error "Register %c is not containing text string" reg))))
       (if (vi-string-end-with-nl-p put-text) ; put back text as lines
          (if after-p
-             (progn (next-line 1) (beginning-of-line))
+             (progn (forward-line 1) (beginning-of-line))
            (beginning-of-line))
        (if after-p (forward-char 1)))
       (push-mark (point))

diff --git a/lisp/obsolete/mlsupport.el b/lisp/obsolete/mlsupport.el
index d1844cd42ced9d80fa493aabd5e3f643d60cb3f7..2465ea4eabd39afb49253ce6da591d395ab8735b 100644 (file)
--- a/lisp/obsolete/mlsupport.el
+++ b/lisp/obsolete/mlsupport.el
@@ -186,10 +186,10 @@
   (newline (ml-prefix-argument)))
 
 (defun ml-next-line ()
-  (next-line (ml-prefix-argument)))
+  (forward-line (ml-prefix-argument)))
 
 (defun ml-previous-line ()
-  (previous-line (ml-prefix-argument)))
+  (forward-line (- (ml-prefix-argument))))
 
 (defun delete-to-kill-buffer ()
   (kill-region (point) (mark)))

diff --git a/lisp/progmodes/ada-xref.el b/lisp/progmodes/ada-xref.el
index c37d11910d46c3a3404f43f18f6dd40492dc4343..ddea4c293df836cc6d527e820683f1c42513ea30 100644 (file)
--- 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 4148f327ecc852cdf25e4166ba859b09dc2f1de1..275773049e7449263c102989e8e9846450f644cd 100644 (file)
--- 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 4d2dd7f315e5d70948bac4c96db92626b5f61eb7..eebfd377a7edc6544fcdae1c63dd42d8a4945fac 100644 (file)
--- 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 7cff1bc516e1b05ecfd877d1a00a811bea8bbf1e..470988f4c14d84256a8c83d1cb0df1b6366c6215 100644 (file)
--- 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))

diff --git a/lisp/textmodes/bib-mode.el b/lisp/textmodes/bib-mode.el
index b457956b9baad2217780048dd8c37da35c5c621e..74800197bcc742d56a2a09f4e11db04bf2e565b2 100644 (file)
--- a/lisp/textmodes/bib-mode.el
+++ b/lisp/textmodes/bib-mode.el
@@ -127,7 +127,7 @@ with the cdr.")
       ((null slots)
         (if (bobp)
            ""
-           (progn (previous-line 1) (bib-find-key bib-assoc))))
+           (progn (forward-line -1) (bib-find-key bib-assoc))))
       ((looking-at (car (car slots)))
         (cdr (car slots)))
       (t (bib-find-key (cdr slots)))
@@ -181,7 +181,7 @@ with the cdr.")
    (beginning-of-line nil)
    (push-mark (point))
    (re-search-forward "^ *$" nil 2)
-   (next-line 1)
+   (forward-line 1)
    (beginning-of-line nil))
 
 (defun unread-bib ()

diff --git a/lisp/textmodes/two-column.el b/lisp/textmodes/two-column.el
index e1f55c0dece3799352f1a8b9c1528960e6d8c390..367a33a85b8a3391dbb8e7e5c6e2df3d6dcd81bb 100644 (file)
--- 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)))