[Emacs-diffs] fix/no-undo-boundary-on-secondary-buffer-change f981ff9 4/4: Fixes after name change.

[Phillip Lord]

branch: fix/no-undo-boundary-on-secondary-buffer-change
commit f981ff975f094aebc6399e23c7c258036636cc1f
Author: Phillip Lord <address@hidden>
Commit: Phillip Lord <address@hidden>

    Fixes after name change.
---
 lisp/simple.el |    8 ++++----
 src/cmds.c     |    3 ---
 src/undo.c     |    4 ++--
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/lisp/simple.el b/lisp/simple.el
index d6c5e1f..9c1871d 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -2828,7 +2828,7 @@ REASON describes the reason that the boundary is being 
added; see
 
 (defun undo--auto-boundary-timer ()
   "Timer which will run `undo--auto-boundary-timer'."
-  (undo-auto-boundary 'timer)
+  (undo--auto-boundary 'timer)
   (setq undo-auto-current-boundary-timer nil))
 
 (defun undo--auto-boundary-ensure-timer ()
@@ -2850,7 +2850,7 @@ See also `undo--buffer-undoably-changed'.")
   "Add an `undo-boundary' is appropriate buffers."
   (unless (eq buffer-undo-list t)
     (undo--auto-boundary
-     (if undo--last-command-amalgamating
+     (if undo--this-command-amalgamating
          'amalgamate
        'command))))
 
@@ -2861,7 +2861,7 @@ the previous `undo-boundary' if a series of 
`self-insert-command'
 calls have been made."
   (let ((last-amalgamating-count
          (undo--last-boundary-amalgamating-p)))
-    (setq undo--last-command-amalgamating t)
+    (setq undo--this-command-amalgamating t)
     (when
         last-amalgamating-count
       (if
@@ -2870,7 +2870,7 @@ calls have been made."
            (eq this-command last-command))
           (setq buffer-undo-list
                 (cdr buffer-undo-list))
-        (setq undo--last-boundary 0)))))
+        (setq undo-last-boundary 0)))))
 
 (defun undo--undoable-change ()
   "Called after every undoable buffer change."
diff --git a/src/cmds.c b/src/cmds.c
index 49c6a55..a2b011d 100644
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -290,8 +290,6 @@ At the end, it runs `post-self-insert-hook'.  */)
     int character = translate_char (Vtranslation_table_for_input,
                                    XINT (last_command_event));
     int val = internal_self_insert (character, XFASTINT (n));
-    if (val == 2)
-      nonundocount = 0;
     frame_make_pointer_invisible (SELECTED_FRAME ());
   }
 
@@ -528,7 +526,6 @@ keys_of_cmds (void)
 {
   int n;
 
-  nonundocount = 0;
   initial_define_key (global_map, Ctl ('I'), "self-insert-command");
   for (n = 040; n < 0177; n++)
     initial_define_key (global_map, n, "self-insert-command");
diff --git a/src/undo.c b/src/undo.c
index d178757..dd4f3e6 100644
--- a/src/undo.c
+++ b/src/undo.c
@@ -40,7 +40,7 @@ static Lisp_Object pending_boundary;
 void
 run_undoable_change ()
 {
-  call0 (Qundo_undoable_change);
+  call0 (Qundo__undoable_change);
 }
 
 /* Record point as it was at beginning of this command (if necessary)
@@ -490,7 +490,7 @@ void
 syms_of_undo (void)
 {
   DEFSYM (Qinhibit_read_only, "inhibit-read-only");
-  DEFSYM (Qundo_undoable_change, "undo-undoable-change");
+  DEFSYM (Qundo__undoable_change, "undo--undoable-change");
   DEFSYM (Qundo_last_boundary, "undo-last-boundary");
 
   /* Marker for function call undo list elements.  */