From: Barry OReilly <gundaetiapo@gmail.com>
To: 16411@debbugs.gnu.org
Subject: bug#16411: undo-only bugs
Date: Tue, 18 Feb 2014 12:40:38 -0500 [thread overview]
Message-ID: <CAFM41H1-RsyTCe5nkrQK5tavSqNOh-00ZFrmRpvQ4XTu0nASbw@mail.gmail.com> (raw)
In-Reply-To: <CAFM41H1m2EHLZHq=0pPeGaQ0pic6KE5j6fiAWM_nBP5JZWh8+g@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 2943 bytes --]
> ;; (BEGIN . END)
> (and (>= (car undo-elt) start)
> (<= (cdr undo-elt) end))
> ^^
>
> ;; (TEXT . POSITION)
> (and (>= (abs (cdr undo-elt)) start)
> (< (abs (cdr undo-elt)) end))
> ^
Using 'git log -L' on these two code fragments, I found the (BEGIN .
END) case changed in this commit to "Fix one-off error at END".
commit 9debee7a5e6ebc0c32141619248e7390f1476946
Author: Richard M. Stallman <rms@gnu.org>
Date: Mon Sep 9 00:27:30 2002 +0000
(undo-elt-in-region): Fix one-off error at END.
(forward-visible-line): Handle invisibility by ignoring
invisible newlines. Also include entire invisible lines beyond
the stopping point.
diff --git a/lisp/simple.el b/lisp/simple.el
index bfef653..d9ae114 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1089,7 +1089,7 @@ we stop and ignore all further elements."
If it crosses the edge, we return nil."
(cond ((integerp undo-elt)
(and (>= undo-elt start)
- (< undo-elt end)))
+ (<= undo-elt end)))
((eq undo-elt nil)
t)
((atom undo-elt)
@@ -1109,16 +1109,16 @@ If it crosses the edge, we return nil."
(cons alist-elt undo-adjusted-markers)))
(and (cdr alist-elt)
(>= (cdr alist-elt) start)
- (< (cdr alist-elt) end))))
+ (<= (cdr alist-elt) end))))
((null (car undo-elt))
;; (nil PROPERTY VALUE BEG . END)
(let ((tail (nthcdr 3 undo-elt)))
(and (>= (car tail) start)
- (< (cdr tail) end))))
+ (<= (cdr tail) end))))
((integerp (car undo-elt))
;; (BEGIN . END)
(and (>= (car undo-elt) start)
- (< (cdr undo-elt) end)))))
+ (<= (cdr undo-elt) end)))))
(defun undo-elt-crosses-region (undo-elt start end)
"Test whether UNDO-ELT crosses one edge of that region START ... END.
This didn't change the (TEXT . POSITION) case, which hasn't changed
since 1998 when it was first introduced. Maybe it was forgotten in the
above 2002 change?
Anyway, I made this change locally:
diff --git a/lisp/simple.el b/lisp/simple.el
index b90382d..01d4f19 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -2434,7 +2434,7 @@ If it crosses the edge, we return nil."
((stringp (car undo-elt))
;; (TEXT . POSITION)
(and (>= (abs (cdr undo-elt)) start)
- (< (abs (cdr undo-elt)) end)))
+ (<= (abs (cdr undo-elt)) end)))
((and (consp undo-elt) (markerp (car undo-elt)))
;; This is a marker-adjustment element (MARKER . ADJUSTMENT).
;; See if MARKER is inside the region.
and I didn't witness the incorrect behavior from undo in region.
Another justification for this change, in addition to fixing the
buffer corruption my recipe demonstrates, is that without it, a
deletion at the EOB is inaccessible via undo in region.
[-- Attachment #2: Type: text/html, Size: 3419 bytes --]
next prev parent reply other threads:[~2014-02-18 17:40 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-10 22:33 bug#16411: undo-only bugs Barry OReilly
2014-01-10 23:54 ` Stefan Monnier
2014-01-11 3:48 ` Barry OReilly
2014-01-11 4:29 ` Stefan Monnier
2014-01-11 5:09 ` Barry OReilly
2014-01-14 0:49 ` Stefan Monnier
2014-01-14 1:52 ` Stefan Monnier
2014-01-14 14:00 ` Barry OReilly
2014-01-19 0:58 ` Barry OReilly
2014-01-19 3:18 ` Stefan Monnier
2014-01-19 16:57 ` Barry OReilly
2014-02-14 18:51 ` Barry OReilly
2014-02-14 22:29 ` Barry OReilly
2014-02-18 17:40 ` Barry OReilly [this message]
2014-02-26 15:20 ` bug#16411: undo in region corrupts existing text Barry OReilly
2014-02-27 5:02 ` Stefan Monnier
2014-05-13 15:01 ` bug#16411: undo-only bugs Barry OReilly
2014-05-14 18:06 ` Stefan Monnier
2014-05-14 18:45 ` Stefan Monnier
2014-05-14 19:55 ` Stefan Monnier
2014-05-14 21:56 ` Barry OReilly
2014-05-15 2:23 ` Stefan Monnier
2014-05-15 3:51 ` Barry OReilly
2014-05-15 13:00 ` Stefan Monnier
2014-05-28 18:42 ` Barry OReilly
2014-06-19 21:35 ` Stefan Monnier
2014-05-14 13:32 ` Barry OReilly
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAFM41H1-RsyTCe5nkrQK5tavSqNOh-00ZFrmRpvQ4XTu0nASbw@mail.gmail.com \
--to=gundaetiapo@gmail.com \
--cc=16411@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.