Commit e3d090b4 authored by Barry O'Reilly's avatar Barry O'Reilly

* simple.el (undo-elt-in-region): Fix buffer corruption for edge

case of undo in region.
* automated/undo-tests.el (undo-test-in-region-not-most-recent):
Add new test of undo in region.
(undo-test-in-region-eob): Add test case described at
http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16411#41
parent b923819c
2014-03-02 Barry O'Reilly <gundaetiapo@gmail.com>
* simple.el (undo-elt-in-region): Fix buffer corruption for edge
case of undo in region.
2014-03-02 Martin Rudalics <rudalics@gmx.at>
* window.el (fit-window-to-buffer): Fix argument in window-size
......
......@@ -2426,7 +2426,7 @@ If it crosses the edge, we return nil."
((stringp (car undo-elt))
;; (TEXT . POSITION)
(and (>= (abs (cdr undo-elt)) start)
(< (abs (cdr undo-elt)) end)))
(<= (abs (cdr undo-elt)) end)))
((and (consp undo-elt) (markerp (car undo-elt)))
;; This is a marker-adjustment element (MARKER . ADJUSTMENT).
;; See if MARKER is inside the region.
......
2014-03-02 Barry O'Reilly <gundaetiapo@gmail.com>
* automated/undo-tests.el (undo-test-in-region-not-most-recent):
Add new test of undo in region.
(undo-test-in-region-eob): Add test case described at
http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16411
2014-02-28 Michael Albinus <michael.albinus@gmx.de>
* automated/tramp-tests.el (tramp--test-enabled)
......
......@@ -226,6 +226,48 @@
(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"))))
(defun undo-test-all (&optional interactive)
"Run all tests for \\[undo]."
(interactive "p")
......
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