aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorBarry O'Reilly2014-03-02 12:37:32 -0500
committerBarry O'Reilly2014-03-02 12:37:32 -0500
commite3d090b4c50756f1ed9db55553a98b515eec5eaa (patch)
tree9b0c093244886dc48b60d7b2a678cc6b6b97d6a6 /lisp
parentb923819c10d71fe1824d0c25787a16a38d08d926 (diff)
downloademacs-e3d090b4c50756f1ed9db55553a98b515eec5eaa.tar.gz
emacs-e3d090b4c50756f1ed9db55553a98b515eec5eaa.zip
* 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
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/simple.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 17f225708a2..a2a88f4b86b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12014-03-02 Barry O'Reilly <gundaetiapo@gmail.com>
2
3 * simple.el (undo-elt-in-region): Fix buffer corruption for edge
4 case of undo in region.
5
12014-03-02 Martin Rudalics <rudalics@gmx.at> 62014-03-02 Martin Rudalics <rudalics@gmx.at>
2 7
3 * window.el (fit-window-to-buffer): Fix argument in window-size 8 * window.el (fit-window-to-buffer): Fix argument in window-size
diff --git a/lisp/simple.el b/lisp/simple.el
index bf8b6a75ac7..18448331ff0 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -2426,7 +2426,7 @@ If it crosses the edge, we return nil."
2426 ((stringp (car undo-elt)) 2426 ((stringp (car undo-elt))
2427 ;; (TEXT . POSITION) 2427 ;; (TEXT . POSITION)
2428 (and (>= (abs (cdr undo-elt)) start) 2428 (and (>= (abs (cdr undo-elt)) start)
2429 (< (abs (cdr undo-elt)) end))) 2429 (<= (abs (cdr undo-elt)) end)))
2430 ((and (consp undo-elt) (markerp (car undo-elt))) 2430 ((and (consp undo-elt) (markerp (car undo-elt)))
2431 ;; This is a marker-adjustment element (MARKER . ADJUSTMENT). 2431 ;; This is a marker-adjustment element (MARKER . ADJUSTMENT).
2432 ;; See if MARKER is inside the region. 2432 ;; See if MARKER is inside the region.