Merge from emacs--devo--0

[gnu-emacs] / lisp / obsolete / mlsupport.el

diff --git a/lisp/obsolete/mlsupport.el b/lisp/obsolete/mlsupport.el
index ffe89c4632a097df2a8385db744a8701e86fc6cd..07bd2d387f617b84d1b3642f0656c73b4b4d62e8 100644 (file)
--- a/lisp/obsolete/mlsupport.el
+++ b/lisp/obsolete/mlsupport.el
@@ -1,7 +1,7 @@
 ;;; mlsupport.el --- run-time support for mocklisp code
 
 ;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007, 2008 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: extensions
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -127,13 +127,6 @@
 
 (defun ml-message (&rest args) (message "%s" (apply 'concat args)))
 
-(defun kill-to-end-of-line ()
-  (ml-prefix-argument-loop
-    (if (eolp)
-       (kill-region (point) (1+ (point)))
-      (kill-region (point) (if (search-forward ?\n nil t)
-                              (1- (point)) (point-max))))))
-
 (defun set-auto-fill-hook (arg)
   (setq auto-fill-function (intern arg)))
 
@@ -186,10 +179,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)))
@@ -351,7 +344,7 @@
       (setq count (1+ count)))))
 
 (defun ml-next-page ()
-  (previous-page (- (ml-prefix-argument))))
+  (ml-previous-page (- (ml-prefix-argument))))
 
 (defun page-next-window (&optional arg)
   (let ((count (or arg (ml-prefix-argument))))