Add new maintainer (deego).

[gnu-emacs] / lisp / textmodes / page.el

diff --git a/lisp/textmodes/page.el b/lisp/textmodes/page.el
index c110ca842edc9ce6e73c81a5264e6be647be0c8c..ec09153d139398fdbf08a1145274fa5c36e626e4 100644 (file)
--- a/lisp/textmodes/page.el
+++ b/lisp/textmodes/page.el
@@ -1,8 +1,9 @@
-;;; page.el --- page motion commands for emacs.
+;;; page.el --- page motion commands for Emacs
 
 ;; Copyright (C) 1985 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
+;; Keywords: wp convenience
 
 ;; This file is part of GNU Emacs.
 
@@ -17,8 +18,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to
-;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
 
 ;;; Commentary:
 
@@ -88,15 +90,28 @@ thus showing a page other than the one point was originally in."
     (if (> arg 0)
        (forward-page arg)
       (if (< arg 0)
-         (forward-page (1- arg))))
+         (let ((adjust 0)
+               (opoint (point)))
+           ;; If we are not now at the beginning of a page,
+           ;; move back one extra time, to get to the start of this page.
+           (save-excursion
+             (beginning-of-line)
+             (or (and (looking-at page-delimiter)
+                      (eq (match-end 0) opoint))
+                 (setq adjust 1)))
+           (forward-page (- arg adjust)))))
     ;; Find the end of the page.
+    (set-match-data nil)
     (forward-page)
     ;; If we stopped due to end of buffer, stay there.
     ;; If we stopped after a page delimiter, put end of restriction
     ;; at the beginning of that line.
-    (if (save-excursion
-         (goto-char (match-beginning 0)) ; was (beginning-of-line)
-         (looking-at page-delimiter))
+    ;; Before checking the match that was found,
+    ;; verify that forward-page actually set the match data.
+    (if (and (match-beginning 0)
+            (save-excursion
+              (goto-char (match-beginning 0)) ; was (beginning-of-line)
+              (looking-at page-delimiter)))
        (beginning-of-line))
     (narrow-to-region (point)
                      (progn