Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 899-900)

   - Update from CVS
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 129-130)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 259-260)

   - Merge from emacs--rel--22
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-272

2 files changed, 6 insertions, 6 deletions

diff --git a/lisp/emulation/edt.el b/lisp/emulation/edt.el
index 44067dba1f2..bff1a583586 100644
--- 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 977a7980803..81ad04b60d9 100644
--- 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))