* subr.el (forward-point): Add obsolescence declaration.

* paren.el (show-paren-function):
* simple.el (kill-forward-chars, kill-backward-chars):
 Use (+/- (point) N), instead of `forward-point'.

4 files changed, 14 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e2e458edbfc..cbae73edfd0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2009-03-19  Juanma Barranquero  <lekktu@gmail.com>
+
+        * subr.el (forward-point): Add obsolescence declaration.
+
+        * paren.el (show-paren-function):
+        * simple.el (kill-forward-chars, kill-backward-chars):
+         Use (+/- (point) N), instead of `forward-point'.
+
 2009-03-19  Glenn Morris  <rgm@gnu.org>
 
         * mail/rmail.el (rmail-retry-ignored-headers): Add :version tag.
diff --git a/lisp/paren.el b/lisp/paren.el
index 041f43e1fbc..9648471d373 100644
--- a/lisp/paren.el
+++ b/lisp/paren.el
@@ -212,9 +212,9 @@ in `show-paren-style' after `show-paren-delay' seconds of Emacs idle time."
                 (delete-overlay show-paren-overlay-1))
             (let ((from (if (= dir 1)
                             (point)
-                          (forward-point -1)))
+                          (- (point) 1)))
                   (to (if (= dir 1)
-                          (forward-point 1)
+                          (+ (point) 1)
                         (point))))
               (if show-paren-overlay-1
                   (move-overlay show-paren-overlay-1 from to (current-buffer))
@@ -238,7 +238,7 @@ in `show-paren-style' after `show-paren-delay' seconds of Emacs idle time."
                           pos
                         (save-excursion
                           (goto-char pos)
-                          (forward-point (- dir))))))
+                          (- (point) dir)))))
             (if show-paren-overlay
                 (move-overlay show-paren-overlay from to (current-buffer))
               (setq show-paren-overlay (make-overlay from to nil t))))
diff --git a/lisp/simple.el b/lisp/simple.el
index cf4bd434a2d..db1cdcfe5e6 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -3103,13 +3103,13 @@ With ARG, rotate that many kills forward (or backward, if negative)."
 (defun kill-forward-chars (arg)
   (if (listp arg) (setq arg (car arg)))
   (if (eq arg '-) (setq arg -1))
-  (kill-region (point) (forward-point arg)))
+  (kill-region (point) (+ (point) arg)))
 
 ;; Internal subroutine of backward-delete-char
 (defun kill-backward-chars (arg)
   (if (listp arg) (setq arg (car arg)))
   (if (eq arg '-) (setq arg -1))
-  (kill-region (point) (forward-point (- arg))))
+  (kill-region (point) (- (point) arg)))
 
 (defcustom backward-delete-char-untabify-method 'untabify
   "The method for untabifying when deleting backward.
diff --git a/lisp/subr.el b/lisp/subr.el
index 7b169cc280b..ffe8a9de5b1 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -998,6 +998,7 @@ and `event-end' functions."
 (define-obsolete-function-alias 'string-to-int 'string-to-number "22.1")
 
 (make-obsolete 'char-bytes "now always returns 1." "20.4")
+(make-obsolete 'forward-point "use (+ (point) N) instead." "23.1")
 
 (defun insert-string (&rest args)
   "Mocklisp-compatibility insert function.