Commit f2a7acdd authored by Simen Heggestøyl's avatar Simen Heggestøyl

Use lexical-binding in page.el and add tests

* lisp/textmodes/page.el: Use lexical-binding.
(forward-page): Replace `(if x nil y)' with `(unless x y)'.

* test/lisp/textmodes/page-tests.el: New file with tests for page.el.
parent b6c628a1
Pipeline #1853 failed with stage
in 3 seconds
;;; page.el --- page motion commands for Emacs
;;; page.el --- page motion commands for Emacs -*- lexical-binding: t; -*-
;; Copyright (C) 1985, 2001-2019 Free Software Foundation, Inc.
......@@ -38,8 +38,7 @@ A page boundary is any line whose beginning matches the regexp
;; In case the page-delimiter matches the null string,
;; don't find a match without moving.
(if (bolp) (forward-char 1))
(if (re-search-forward page-delimiter nil t)
(unless (re-search-forward page-delimiter nil t)
(goto-char (point-max)))
(setq count (1- count)))
(while (and (< count 0) (not (bobp)))
;;; page-tests.el --- Tests for page.el -*- lexical-binding: t; -*-
;; Copyright (C) 2019 Free Software Foundation, Inc.
;; Author: Simen Heggestøyl <>
;; Keywords:
;; This file is part of GNU Emacs.
;; 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 3 of the License, or
;; (at your option) any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs. If not, see <>.
;;; Commentary:
;;; Code:
(require 'ert)
(require 'page)
(ert-deftest page-tests-forward-page ()
(insert "foo\n \nbar\n \nbaz")
(forward-page -1)
(should (looking-at-p "\nbaz"))
(forward-page -2)
(should (= (point) (point-min)))
(forward-page 1)
(should (looking-at-p "\nbar"))
(should (looking-at-p "\nbaz"))
(forward-page 1)
(should (= (point) (point-max)))))
(ert-deftest page-tests-backward-page ()
(insert "foo\n \nbar\n \nbaz")
(backward-page 1)
(should (looking-at-p "\nbaz"))
(should (looking-at-p "\nbar"))
(backward-page 1)
(should (= (point) (point-min)))
(backward-page -1)
(should (looking-at-p "\nbar"))
(backward-page -2)
(should (= (point) (point-max)))))
(defun page-tests--region-string ()
"Return the contents of the region as a string."
(buffer-substring (region-beginning) (region-end)))
(ert-deftest page-tests-mark-page ()
(insert "foo\n \nbar\n \nbaz")
(should (equal (page-tests--region-string) "\nbaz"))
(mark-page -2)
(should (equal (page-tests--region-string) "foo\n "))
(mark-page 1)
(should (equal (page-tests--region-string) "\nbar\n "))))
(ert-deftest page-tests-narrow-to-page ()
(insert "foo\n \nbar\n \nbaz")
(goto-char (point-min))
(should (equal (buffer-string) "foo\n"))
(narrow-to-page 2)
(should (equal (buffer-string) "baz"))
(narrow-to-page -1)
(should (equal (buffer-string) "bar\n"))))
(provide 'page-tests)
;;; page-tests.el ends here
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment