diff options
| author | Miles Bader | 2005-02-06 12:06:02 +0000 |
|---|---|---|
| committer | Miles Bader | 2005-02-06 12:06:02 +0000 |
| commit | a359f0e0ff878285654e2f0bcc7bd3b4340c778c (patch) | |
| tree | cc0aff13c751bb8ab7ccaae29082bab32e15fd13 /src/undo.c | |
| parent | f3d3402885646e6fa79f1ad59fb8a1f9017851d7 (diff) | |
| parent | 56c30d721096a64f151f9ea6e3c76562380da895 (diff) | |
| download | emacs-a359f0e0ff878285654e2f0bcc7bd3b4340c778c.tar.gz emacs-a359f0e0ff878285654e2f0bcc7bd3b4340c778c.zip | |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-11
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-69
- miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-71
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-72
src/dispextern.h (xassert): Enable unconditionally.
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-73
- miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-81
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-82
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-12
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-13
Update from CVS
Diffstat (limited to 'src/undo.c')
| -rw-r--r-- | src/undo.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/undo.c b/src/undo.c index ea4f35397a9..eaf312be676 100644 --- a/src/undo.c +++ b/src/undo.c | |||
| @@ -560,12 +560,13 @@ Return what remains of the list. */) | |||
| 560 | } | 560 | } |
| 561 | cdr = Fcdr (cdr); | 561 | cdr = Fcdr (cdr); |
| 562 | apply1 (car, cdr); | 562 | apply1 (car, cdr); |
| 563 | |||
| 563 | /* Make sure this produces at least one undo entry, | 564 | /* Make sure this produces at least one undo entry, |
| 564 | so the test in `undo' for continuing an undo series | 565 | so the test in `undo' for continuing an undo series |
| 565 | will work right. */ | 566 | will work right. */ |
| 566 | if (EQ (oldlist, current_buffer->undo_list)) | 567 | if (EQ (oldlist, current_buffer->undo_list)) |
| 567 | current_buffer->undo_list | 568 | current_buffer->undo_list |
| 568 | = Fcons (list2 (Qcdr, Qnil), current_buffer->undo_list); | 569 | = Fcons (list3 (Qapply, Qcdr, Qnil), current_buffer->undo_list); |
| 569 | } | 570 | } |
| 570 | else if (STRINGP (car) && INTEGERP (cdr)) | 571 | else if (STRINGP (car) && INTEGERP (cdr)) |
| 571 | { | 572 | { |