Commit 713c9020 authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

(undo): Record t in undo-equiv-table

for the redo record made by an undo-in-region.
parent 94285c26
2005-04-11 Richard M. Stallman <rms@gnu.org>
* simple.el (undo): Record t in undo-equiv-table
for the redo record made by an undo-in-region.
2005-04-12 Nick Roberts <nickrob@snap.net.nz> 2005-04-12 Nick Roberts <nickrob@snap.net.nz>
   
* progmodes/gdb-ui.el (gdb-display-inferior-io-buffer) * progmodes/gdb-ui.el (gdb-display-inferior-io-buffer)
......
...@@ -1279,7 +1279,9 @@ Return 0 if current buffer is not a mini-buffer." ...@@ -1279,7 +1279,9 @@ Return 0 if current buffer is not a mini-buffer."
(defalias 'advertised-undo 'undo) (defalias 'advertised-undo 'undo)
(defconst undo-equiv-table (make-hash-table :test 'eq :weakness t) (defconst undo-equiv-table (make-hash-table :test 'eq :weakness t)
"Table mapping redo records to the corresponding undo one.") "Table mapping redo records to the corresponding undo one.
A redo record for undo-in-region maps to t.
A redo record for ordinary undo maps to the following (earlier) undo.")
(defvar undo-in-region nil (defvar undo-in-region nil
"Non-nil if `pending-undo-list' is not just a tail of `buffer-undo-list'.") "Non-nil if `pending-undo-list' is not just a tail of `buffer-undo-list'.")
...@@ -1339,7 +1341,7 @@ as an argument limits undo to changes within the current region." ...@@ -1339,7 +1341,7 @@ as an argument limits undo to changes within the current region."
(message (if undo-in-region (message (if undo-in-region
(if equiv "Redo in region!" "Undo in region!") (if equiv "Redo in region!" "Undo in region!")
(if equiv "Redo!" "Undo!")))) (if equiv "Redo!" "Undo!"))))
(when (and equiv undo-no-redo) (when (and (listp equiv) undo-no-redo)
;; The equiv entry might point to another redo record if we have done ;; The equiv entry might point to another redo record if we have done
;; undo-redo-undo-redo-... so skip to the very last equiv. ;; undo-redo-undo-redo-... so skip to the very last equiv.
(while (let ((next (gethash equiv undo-equiv-table))) (while (let ((next (gethash equiv undo-equiv-table)))
...@@ -1350,10 +1352,13 @@ as an argument limits undo to changes within the current region." ...@@ -1350,10 +1352,13 @@ as an argument limits undo to changes within the current region."
(prefix-numeric-value arg) (prefix-numeric-value arg)
1)) 1))
;; Record the fact that the just-generated undo records come from an ;; Record the fact that the just-generated undo records come from an
;; undo operation, so we can skip them later on. ;; undo operation--that is, they are redo records.
;; In the ordinary case (not within a region), map the redo
;; record to the following undos.
;; I don't know how to do that in the undo-in-region case. ;; I don't know how to do that in the undo-in-region case.
(unless undo-in-region (puthash buffer-undo-list
(puthash buffer-undo-list pending-undo-list undo-equiv-table)) (if undo-in-region t pending-undo-list)
undo-equiv-table)
;; Don't specify a position in the undo record for the undo command. ;; Don't specify a position in the undo record for the undo command.
;; Instead, undoing this should move point to where the change is. ;; Instead, undoing this should move point to where the change is.
(let ((tail buffer-undo-list) (let ((tail buffer-undo-list)
......
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