>From c7e116d16299dfe3bb13a6574f9b03542cb72099 Mon Sep 17 00:00:00 2001 From: Phillip Lord Date: Thu, 30 Jun 2016 22:06:00 +0100 Subject: [PATCH] Fix missing point information in undo * src/undo.c (record_insert): Use record_point instead of prepare_record, and do so unconditionally. (prepare_record): Do not record first change. (record_point): Now conditional on state before the last command. (record_delete): Call record_point unconditionally. (record_property_change): Use prepare_record. (record_marker_adjustments): Use prepare_record. Addresses Bug# 21722 --- src/undo.c | 51 +++++++++++++++++++++---------------------- test/automated/simple-test.el | 19 +++++++++++++++- 2 files changed, 43 insertions(+), 27 deletions(-) diff --git a/src/undo.c b/src/undo.c index be5b270..2676c3d 100644 --- a/src/undo.c +++ b/src/undo.c @@ -31,25 +31,21 @@ along with GNU Emacs. If not, see . */ an undo-boundary. */ static Lisp_Object pending_boundary; -/* Record point as it was at beginning of this command (if necessary) - and prepare the undo info for recording a change. - Prepare the undo info for recording a change. */ +/* Prepare the undo info for recording a change. */ static void prepare_record (void) { /* Allocate a cons cell to be the undo boundary after this command. */ if (NILP (pending_boundary)) pending_boundary = Fcons (Qnil, Qnil); - - if (MODIFF <= SAVE_MODIFF) - record_first_change (); } -/* Record point as it was at beginning of this command. - PT is the position of point that will naturally occur as a result of the - undo record that will be added just after this command terminates. */ +/* Record point, if necessary, as it was at beginning of this command. + BEG is the position of point that will naturally occur as a result + of the undo record that will be added just after this command + terminates. */ static void -record_point (ptrdiff_t pt) +record_point (ptrdiff_t beg) { /* Don't record position of pt when undo_inhibit_record_point holds. */ if (undo_inhibit_record_point) @@ -57,16 +53,23 @@ record_point (ptrdiff_t pt) bool at_boundary; + /* Check whether we are at a boundary now, in case we record the + first change. */ at_boundary = ! CONSP (BVAR (current_buffer, undo_list)) || NILP (XCAR (BVAR (current_buffer, undo_list))); - prepare_record (); + /* If this is the first change since save, then record this.*/ + if (MODIFF <= SAVE_MODIFF) + record_first_change (); - /* If we are just after an undo boundary, and - point wasn't at start of deleted range, record where it was. */ - if (at_boundary) + /* If we are just after an undo boundary, and point was not at start + of deleted range, and the recorded point was in this buffer, then + record where it was. */ + if (at_boundary + && point_before_last_command_or_undo != beg + && buffer_before_last_command_or_undo == current_buffer ) bset_undo_list (current_buffer, - Fcons (make_number (pt), + Fcons (make_number (point_before_last_command_or_undo), BVAR (current_buffer, undo_list))); } @@ -85,6 +88,8 @@ record_insert (ptrdiff_t beg, ptrdiff_t length) prepare_record (); + record_point (beg); + /* If this is following another insertion and consecutive with it in the buffer, combine the two. */ if (CONSP (BVAR (current_buffer, undo_list))) @@ -120,9 +125,7 @@ record_marker_adjustments (ptrdiff_t from, ptrdiff_t to) register struct Lisp_Marker *m; register ptrdiff_t charpos, adjustment; - /* Allocate a cons cell to be the undo boundary after this command. */ - if (NILP (pending_boundary)) - pending_boundary = Fcons (Qnil, Qnil); + prepare_record(); for (m = BUF_MARKERS (current_buffer); m; m = m->next) { @@ -163,19 +166,17 @@ record_delete (ptrdiff_t beg, Lisp_Object string, bool record_markers) if (EQ (BVAR (current_buffer, undo_list), Qt)) return; - if (point_before_last_command_or_undo != beg - && buffer_before_last_command_or_undo == current_buffer) - record_point (point_before_last_command_or_undo); + prepare_record (); + + record_point (beg); if (PT == beg + SCHARS (string)) { XSETINT (sbeg, -beg); - prepare_record (); } else { XSETFASTINT (sbeg, beg); - prepare_record (); } /* primitive-undo assumes marker adjustments are recorded @@ -234,9 +235,7 @@ record_property_change (ptrdiff_t beg, ptrdiff_t length, if (EQ (BVAR (buf, undo_list), Qt)) return; - /* Allocate a cons cell to be the undo boundary after this command. */ - if (NILP (pending_boundary)) - pending_boundary = Fcons (Qnil, Qnil); + prepare_record(); if (MODIFF <= SAVE_MODIFF) record_first_change (); diff --git a/test/automated/simple-test.el b/test/automated/simple-test.el index 40cd1d2..c41d010 100644 --- a/test/automated/simple-test.el +++ b/test/automated/simple-test.el @@ -311,6 +311,7 @@ undo-test-point-after-forward-kill (undo-test-point-after-forward-kill)))) (defmacro simple-test-undo-with-switched-buffer (buffer &rest body) + (declare (indent 1) (debug t)) (let ((before-buffer (make-symbol "before-buffer"))) `(let ((,before-buffer (current-buffer))) (unwind-protect @@ -340,8 +341,24 @@ simple-test-undo-with-switched-buffer (point-min) (point-max)))))) +(ert-deftest missing-record-point-in-undo () + "Check point is being restored correctly. - +See Bug#21722." + (should + (= 5 + (with-temp-buffer + (generate-new-buffer " *temp*") + (emacs-lisp-mode) + (setq buffer-undo-list nil) + (insert "(progn (end-of-line) (insert \"hello\"))") + (beginning-of-line) + (forward-char 4) + (undo-boundary) + (eval-defun nil) + (undo-boundary) + (undo) + (point))))) (provide 'simple-test) ;;; simple-test.el ends here -- 2.9.0