* term/x-win.el (x-gtk-stock-map, icon-map-list)

(x-gtk-map-stock): Delete duplicated definitions from merge.

* progmodes/octave-mod.el: Require octave-inf at compile time

* progmodes/compile.el (compilation-skip-to-next-location)
(compilation-skip-threshold, compilation-skip-visited): Move
definitions earlier.

* play/zone.el (zone-fall-through-ws):
* play/landmark.el (lm-move-down, lm-move-up):
* play/handwrite.el (handwrite):
* mail/mspools.el (mspools-visit-spool):
* wdired.el (wdired-next-line, wdired-previous-line):
* tar-mode.el (tar-subfile-save-buffer):
* scroll-lock.el (scroll-lock-next-line)
(scroll-lock-previous-line):
* image-dired.el (image-dired-next-line)
(image-dired-previous-line):
* ediff-help.el (ediff-help-message-line-length): Use
forward-line.

* smerge-mode.el (smerge-auto-refine):
* diff-mode.el (diff-auto-refine): Add :group.

* play/yow.el: Require doctor at compile time.

* vmsproc.el: Provide vmsproc.
(command-send-input): Use forward-line.

* vms-patch.el: Require ps-print and vmsproc at compile time.

* vc-mtn.el (log-view-message-re, log-view-file-re)
(log-view-font-lock-keywords): Pacify byte-compiler.

* vc-hg.el: Require log-view at compile time.

1 files changed, 2 insertions, 2 deletions

diff --git a/lisp/mail/mspools.el b/lisp/mail/mspools.el
index 988ce2f8e0..514bf4fe5f 100644
--- a/lisp/mail/mspools.el
+++ b/lisp/mail/mspools.el
@@ -272,9 +272,9 @@ Buffer is not displayed if SHOW is non-nil."
 			     (end-of-line)
 			     (point)))
 	      mspools-files-len)
-	  (next-line (- 1 mspools-files-len)) ;back to top of list
+	  (forward-line (- 1 mspools-files-len)) ;back to top of list
 	;; else just on to next line
-	(next-line 1))
+	(forward-line 1))
 
       ;; Choose whether to use VM or RMAIL for reading folder.
       (if mspools-using-vm