mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-11-29 07:58:28 +00:00
37ea8275f7
* simple.el (primitive-undo): Only process marker adjustments validated against their corresponding (TEXT . POS). Issue warning for lone marker adjustments in undo history. (Bug#16818) (undo-make-selective-list): Add marker adjustments to selective undo list based on whether their corresponding (TEXT . POS) is in the region. Remove variable adjusted-markers, which was unused and only non nil during undo-make-selective-list. (undo-elt-in-region): Return nil when passed a marker adjustment and explain in function doc. Have (MARKER . ADJUSTMENT) undo records always be immediately after their corresponding (TEXT . POS) record in undo list. (Bug#16818) * lisp.h (record-delete): New arg record_markers. (record_marker_adjustment): No longer needed outside undo.c. * insdel.c (adjust_markers_for_delete): Move calculation of marker adjustments to undo.c's record_marker_adjustments. Note that fileio.c's decide_coding_unwind is another caller to adjust_markers_for_delete. Because it has undo list bound to t, it does not rely on adjust_markers_for_delete to record marker adjustments. (del_range_2): Swap call to record_delete and adjust_markers_for_delete so as undo marker adjustments are recorded before current deletion's adjustments, as before. (adjust_after_replace): (replace_range): Pass value for new record_markers arg to delete_record. * undo.c (record_marker_adjustment): Renamed to record_marker_adjustments and made static. (record_delete): Check record_markers arg and call record_marker_adjustments. (record_change): Pass value for new record_markers arg to delete_record. (record_point): at_boundary calculation no longer needs to account for marker adjustments. * undo-tests.el (undo-test-marker-adjustment-nominal): (undo-test-region-t-marker): New tests of marker adjustments. (undo-test-marker-adjustment-moved): (undo-test-region-mark-adjustment): New tests to demonstrate bug#16818, which fail without the fix. * markers.texi (Moving Marker Positions): The 2014-03-02 doc change mentioning undo's inability to handle relocated markers no longer applies. See bug#16818. * text.texi (Undo): Expand documentation of (TEXT . POS) and (MARKER . ADJUSTMENT) undo elements.
378 lines
11 KiB
EmacsLisp
378 lines
11 KiB
EmacsLisp
;;; undo-tests.el --- Tests of primitive-undo
|
|
|
|
;; Copyright (C) 2012-2014 Free Software Foundation, Inc.
|
|
|
|
;; Author: Aaron S. Hawley <aaron.s.hawley@gmail.com>
|
|
|
|
;; This program 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.
|
|
;;
|
|
;; This program is distributed in the hope that it will be useful, but
|
|
;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
;; General Public License for more details.
|
|
;;
|
|
;; You should have received a copy of the GNU General Public License
|
|
;; along with this program. If not, see `http://www.gnu.org/licenses/'.
|
|
|
|
;;; Commentary:
|
|
|
|
;; Profiling when the code was translate from C to Lisp on 2012-12-24.
|
|
|
|
;;; C
|
|
|
|
;; (elp-instrument-function 'primitive-undo)
|
|
;; (load-file "undo-test.elc")
|
|
;; (benchmark 100 '(let ((undo-test5-error nil)) (undo-test-all)))
|
|
;; Elapsed time: 305.218000s (104.841000s in 14804 GCs)
|
|
;; M-x elp-results
|
|
;; Function Name Call Count Elapsed Time Average Time
|
|
;; primitive-undo 2600 3.4889999999 0.0013419230
|
|
|
|
;;; Lisp
|
|
|
|
;; (load-file "primundo.elc")
|
|
;; (elp-instrument-function 'primitive-undo)
|
|
;; (benchmark 100 '(undo-test-all))
|
|
;; Elapsed time: 295.974000s (104.582000s in 14704 GCs)
|
|
;; M-x elp-results
|
|
;; Function Name Call Count Elapsed Time Average Time
|
|
;; primitive-undo 2700 3.6869999999 0.0013655555
|
|
|
|
;;; Code:
|
|
|
|
(require 'ert)
|
|
|
|
(ert-deftest undo-test0 ()
|
|
"Test basics of \\[undo]."
|
|
(with-temp-buffer
|
|
(buffer-enable-undo)
|
|
(condition-case err
|
|
(undo)
|
|
(error
|
|
(unless (string= "No further undo information"
|
|
(cadr err))
|
|
(error err))))
|
|
(undo-boundary)
|
|
(insert "This")
|
|
(undo-boundary)
|
|
(erase-buffer)
|
|
(undo-boundary)
|
|
(insert "That")
|
|
(undo-boundary)
|
|
(forward-word -1)
|
|
(undo-boundary)
|
|
(insert "With ")
|
|
(undo-boundary)
|
|
(forward-word -1)
|
|
(undo-boundary)
|
|
(kill-word 1)
|
|
(undo-boundary)
|
|
(put-text-property (point-min) (point-max) 'face 'bold)
|
|
(undo-boundary)
|
|
(remove-text-properties (point-min) (point-max) '(face default))
|
|
(undo-boundary)
|
|
(set-buffer-multibyte (not enable-multibyte-characters))
|
|
(undo-boundary)
|
|
(undo)
|
|
(should
|
|
(equal (should-error (undo-more nil))
|
|
'(wrong-type-argument number-or-marker-p nil)))
|
|
(undo-more 7)
|
|
(should (string-equal "" (buffer-string)))))
|
|
|
|
(ert-deftest undo-test1 ()
|
|
"Test undo of \\[undo] command (redo)."
|
|
(with-temp-buffer
|
|
(buffer-enable-undo)
|
|
(undo-boundary)
|
|
(insert "This")
|
|
(undo-boundary)
|
|
(erase-buffer)
|
|
(undo-boundary)
|
|
(insert "That")
|
|
(undo-boundary)
|
|
(forward-word -1)
|
|
(undo-boundary)
|
|
(insert "With ")
|
|
(undo-boundary)
|
|
(forward-word -1)
|
|
(undo-boundary)
|
|
(kill-word 1)
|
|
(undo-boundary)
|
|
(facemenu-add-face 'bold (point-min) (point-max))
|
|
(undo-boundary)
|
|
(set-buffer-multibyte (not enable-multibyte-characters))
|
|
(undo-boundary)
|
|
(should
|
|
(string-equal (buffer-string)
|
|
(progn
|
|
(undo)
|
|
(undo-more 4)
|
|
(undo)
|
|
;(undo-more -4)
|
|
(buffer-string))))))
|
|
|
|
(ert-deftest undo-test2 ()
|
|
"Test basic redoing with \\[undo] command."
|
|
(with-temp-buffer
|
|
(buffer-enable-undo)
|
|
(undo-boundary)
|
|
(insert "One")
|
|
(undo-boundary)
|
|
(insert " Zero")
|
|
(undo-boundary)
|
|
(push-mark nil t)
|
|
(delete-region (save-excursion
|
|
(forward-word -1)
|
|
(point)) (point))
|
|
(undo-boundary)
|
|
(beginning-of-line)
|
|
(insert "Zero")
|
|
(undo-boundary)
|
|
(undo)
|
|
(should
|
|
(string-equal (buffer-string)
|
|
(progn
|
|
(undo-more 2)
|
|
(undo)
|
|
(buffer-string))))))
|
|
|
|
(ert-deftest undo-test4 ()
|
|
"Test \\[undo] of \\[flush-lines]."
|
|
(with-temp-buffer
|
|
(buffer-enable-undo)
|
|
(dotimes (i 1048576)
|
|
(if (zerop (% i 2))
|
|
(insert "Evenses")
|
|
(insert "Oddses")))
|
|
(undo-boundary)
|
|
(should
|
|
;; Avoid string-equal because ERT will save the `buffer-string'
|
|
;; to the explanation. Using `not' will record nil or non-nil.
|
|
(not
|
|
(null
|
|
(string-equal (buffer-string)
|
|
(progn
|
|
(flush-lines "oddses" (point-min) (point-max))
|
|
(undo-boundary)
|
|
(undo)
|
|
(undo)
|
|
(buffer-string))))))))
|
|
|
|
(ert-deftest undo-test5 ()
|
|
"Test basic redoing with \\[undo] command."
|
|
(with-temp-buffer
|
|
(buffer-enable-undo)
|
|
(undo-boundary)
|
|
(insert "AYE")
|
|
(undo-boundary)
|
|
(insert " BEE")
|
|
(undo-boundary)
|
|
(setq buffer-undo-list (cons '(0.0 bogus) buffer-undo-list))
|
|
(push-mark nil t)
|
|
(delete-region (save-excursion
|
|
(forward-word -1)
|
|
(point)) (point))
|
|
(undo-boundary)
|
|
(beginning-of-line)
|
|
(insert "CEE")
|
|
(undo-boundary)
|
|
(undo)
|
|
(setq buffer-undo-list (cons "bogus" buffer-undo-list))
|
|
(should
|
|
(string-equal
|
|
(buffer-string)
|
|
(progn
|
|
(if (and (boundp 'undo-test5-error) (not undo-test5-error))
|
|
(progn
|
|
(should (null (undo-more 2)))
|
|
(should (undo)))
|
|
;; Errors are generated by new Lisp version of
|
|
;; `primitive-undo' not by built-in C version.
|
|
(should
|
|
(equal (should-error (undo-more 2))
|
|
'(error "Unrecognized entry in undo list (0.0 bogus)")))
|
|
(should
|
|
(equal (should-error (undo))
|
|
'(error "Unrecognized entry in undo list \"bogus\""))))
|
|
(buffer-string))))))
|
|
|
|
;; http://debbugs.gnu.org/14824
|
|
(ert-deftest undo-test-buffer-modified ()
|
|
"Test undoing marks buffer unmodified."
|
|
(with-temp-buffer
|
|
(buffer-enable-undo)
|
|
(insert "1")
|
|
(undo-boundary)
|
|
(set-buffer-modified-p nil)
|
|
(insert "2")
|
|
(undo)
|
|
(should-not (buffer-modified-p))))
|
|
|
|
(ert-deftest undo-test-file-modified ()
|
|
"Test undoing marks buffer visiting file unmodified."
|
|
(let ((tempfile (make-temp-file "undo-test")))
|
|
(unwind-protect
|
|
(progn
|
|
(with-current-buffer (find-file-noselect tempfile)
|
|
(insert "1")
|
|
(undo-boundary)
|
|
(set-buffer-modified-p nil)
|
|
(insert "2")
|
|
(undo)
|
|
(should-not (buffer-modified-p))))
|
|
(delete-file tempfile))))
|
|
|
|
(ert-deftest undo-test-in-region-not-most-recent ()
|
|
"Test undo in region of an edit not the most recent."
|
|
(with-temp-buffer
|
|
(buffer-enable-undo)
|
|
(transient-mark-mode 1)
|
|
(insert "1111")
|
|
(undo-boundary)
|
|
(goto-char 2)
|
|
(insert "2")
|
|
(forward-char 2)
|
|
(undo-boundary)
|
|
(insert "3")
|
|
(undo-boundary)
|
|
;; Highlight around "2", not "3"
|
|
(push-mark (+ 3 (point-min)) t t)
|
|
(setq mark-active t)
|
|
(goto-char (point-min))
|
|
(undo)
|
|
(should (string= (buffer-string)
|
|
"11131"))))
|
|
|
|
(ert-deftest undo-test-in-region-eob ()
|
|
"Test undo in region of a deletion at EOB, demonstrating bug 16411."
|
|
(with-temp-buffer
|
|
(buffer-enable-undo)
|
|
(transient-mark-mode 1)
|
|
(insert "This sentence corrupted?")
|
|
(undo-boundary)
|
|
;; Same as recipe at
|
|
;; http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16411
|
|
(insert "aaa")
|
|
(undo-boundary)
|
|
(undo)
|
|
;; Select entire buffer
|
|
(push-mark (point) t t)
|
|
(setq mark-active t)
|
|
(goto-char (point-min))
|
|
;; Should undo the undo of "aaa", ie restore it.
|
|
(undo)
|
|
(should (string= (buffer-string)
|
|
"This sentence corrupted?aaa"))))
|
|
|
|
(ert-deftest undo-test-marker-adjustment-nominal ()
|
|
"Test nominal behavior of marker adjustments."
|
|
(with-temp-buffer
|
|
(buffer-enable-undo)
|
|
(insert "abcdefg")
|
|
(undo-boundary)
|
|
(let ((m (make-marker)))
|
|
(set-marker m 2 (current-buffer))
|
|
(goto-char (point-min))
|
|
(delete-forward-char 3)
|
|
(undo-boundary)
|
|
(should (= (point-min) (marker-position m)))
|
|
(undo)
|
|
(undo-boundary)
|
|
(should (= 2 (marker-position m))))))
|
|
|
|
(ert-deftest undo-test-region-t-marker ()
|
|
"Test undo in region containing marker with t insertion-type."
|
|
(with-temp-buffer
|
|
(buffer-enable-undo)
|
|
(transient-mark-mode 1)
|
|
(insert "abcdefg")
|
|
(undo-boundary)
|
|
(let ((m (make-marker)))
|
|
(set-marker-insertion-type m t)
|
|
(set-marker m (point-min) (current-buffer)) ; m at a
|
|
(goto-char (+ 2 (point-min)))
|
|
(push-mark (point) t t)
|
|
(setq mark-active t)
|
|
(goto-char (point-min))
|
|
(delete-forward-char 1) ;; delete region covering "ab"
|
|
(undo-boundary)
|
|
(should (= (point-min) (marker-position m)))
|
|
;; Resurrect "ab". m's insertion type means the reinsertion
|
|
;; moves it forward 2, and then the marker adjustment returns it
|
|
;; to its rightful place.
|
|
(undo)
|
|
(undo-boundary)
|
|
(should (= (point-min) (marker-position m))))))
|
|
|
|
(ert-deftest undo-test-marker-adjustment-moved ()
|
|
"Test marker adjustment behavior when the marker moves.
|
|
Demonstrates bug 16818."
|
|
(with-temp-buffer
|
|
(buffer-enable-undo)
|
|
(insert "abcdefghijk")
|
|
(undo-boundary)
|
|
(let ((m (make-marker)))
|
|
(set-marker m 2 (current-buffer)) ; m at b
|
|
(goto-char (point-min))
|
|
(delete-forward-char 3) ; m at d
|
|
(undo-boundary)
|
|
(set-marker m 4) ; m at g
|
|
(undo)
|
|
(undo-boundary)
|
|
;; m still at g, but shifted 3 because deletion undone
|
|
(should (= 7 (marker-position m))))))
|
|
|
|
(ert-deftest undo-test-region-mark-adjustment ()
|
|
"Test that the mark's marker adjustment in undo history doesn't
|
|
obstruct undo in region from finding the correct change group.
|
|
Demonstrates bug 16818."
|
|
(with-temp-buffer
|
|
(buffer-enable-undo)
|
|
(transient-mark-mode 1)
|
|
(insert "First line\n")
|
|
(insert "Second line\n")
|
|
(undo-boundary)
|
|
|
|
(goto-char (point-min))
|
|
(insert "aaa")
|
|
(undo-boundary)
|
|
|
|
(undo)
|
|
(undo-boundary)
|
|
|
|
(goto-char (point-max))
|
|
(insert "bbb")
|
|
(undo-boundary)
|
|
|
|
(push-mark (point) t t)
|
|
(setq mark-active t)
|
|
(goto-char (- (point) 3))
|
|
(delete-forward-char 1)
|
|
(undo-boundary)
|
|
|
|
(insert "bbb")
|
|
(undo-boundary)
|
|
|
|
(goto-char (point-min))
|
|
(push-mark (point) t t)
|
|
(setq mark-active t)
|
|
(goto-char (+ (point) 3))
|
|
(undo)
|
|
(undo-boundary)
|
|
|
|
(should (string= (buffer-string) "aaaFirst line\nSecond line\nbbb"))))
|
|
|
|
(defun undo-test-all (&optional interactive)
|
|
"Run all tests for \\[undo]."
|
|
(interactive "p")
|
|
(if interactive
|
|
(ert-run-tests-interactively "^undo-")
|
|
(ert-run-tests-batch "^undo-")))
|
|
|
|
(provide 'undo-tests)
|
|
;;; undo-tests.el ends here
|