diff options
Diffstat (limited to 'lisp/simple.el')
| -rw-r--r-- | lisp/simple.el | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/lisp/simple.el b/lisp/simple.el index e38bf70f52..b66827dfa6 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -2839,18 +2839,6 @@ buffers that were changed during the last command.") If set to non-nil, this will effectively disable the timer.") -(defvar-local undo-auto-disable-boundaries nil - "Disable the automatic addition of boundaries. - -If set to non-nil, `undo-boundary' will not be called -automatically in a buffer either at the end of a command, or as a -result of `undo-auto-current-boundary-timer'. - -When this is set to non-nil, it is important to ensure that -`undo-boundary' is called frequently enough. Failure to do so -will result in user-visible warnings that the situation is -probably a bug.") - (defvar undo-auto--this-command-amalgamating nil "Non-nil if `this-command' should be amalgamated. This variable is set to nil by `undo-auto--boundaries' and is set @@ -2890,8 +2878,7 @@ REASON describes the reason that the boundary is being added; see (dolist (b undo-auto--undoably-changed-buffers) (when (buffer-live-p b) (with-current-buffer b - (unless undo-auto-disable-boundaries - (undo-auto--ensure-boundary cause))))) + (undo-auto--ensure-boundary cause)))) (setq undo-auto--undoably-changed-buffers nil)) (defun undo-auto--boundary-timer () @@ -2916,10 +2903,10 @@ default values.") "Add an `undo-boundary' in appropriate buffers." (undo-auto--boundaries (let ((amal undo-auto--this-command-amalgamating)) - (setq undo-auto--this-command-amalgamating nil) - (if amal - 'amalgamate - 'command)))) + (setq undo-auto--this-command-amalgamating nil) + (if amal + 'amalgamate + 'command)))) (defun undo-auto-amalgamate () "Amalgamate undo if necessary. |