Mercurial > hg > xemacs-beta
view src/undo.c @ 5492:e82f5b7010fe
Merge some stuff in man, fix up Makefile
-------------------- ChangeLog entries follow: --------------------
man/ChangeLog addition:
2010-02-19 Ben Wing <ben@xemacs.org>
* widget.texi:
* widget.texi (Top):
* widget.texi (Introduction):
* widget.texi (User Interface):
* widget.texi (Programming Example):
* widget.texi (Setting Up the Buffer):
* widget.texi (Basic Types):
* widget.texi (link):
* widget.texi (url-link):
* widget.texi (info-link):
* widget.texi (push-button):
* widget.texi (editable-field):
* widget.texi (text):
* widget.texi (menu-choice):
* widget.texi (radio-button-choice):
* widget.texi (item):
* widget.texi (choice-item):
* widget.texi (toggle):
* widget.texi (checkbox):
* widget.texi (checklist):
* widget.texi (editable-list):
* widget.texi (group):
* widget.texi (Sexp Types):
* widget.texi (constants):
* widget.texi (generic):
* widget.texi (atoms):
* widget.texi (composite):
* widget.texi (Widget Properties):
* widget.texi (Defining New Widgets):
* widget.texi (Widget Browser):
* widget.texi (Widget Minor Mode):
* widget.texi (Utilities):
* widget.texi (Widget Wishlist):
* widget.texi (Widget Internals):
* widget.texi (GNU Free Documentation License):
* widget.texi (Index):
Sync with FSF 23.1.92.
2010-02-19 Ben Wing <ben@xemacs.org>
* texinfo/fdl.texi: New file.
* texinfo/texinfo.texi:
* texinfo/texinfo.texi (Top):
* texinfo/texinfo.texi (Copying Conditions):
* texinfo/texinfo.texi (Overview):
* texinfo/texinfo.texi (Reporting Bugs):
* texinfo/texinfo.texi (Using Texinfo):
* texinfo/texinfo.texi (Output Formats):
* texinfo/texinfo.texi (Info Files):
* texinfo/texinfo.texi (Printed Books):
* texinfo/texinfo.texi (Formatting Commands):
* texinfo/texinfo.texi (Conventions):
* texinfo/texinfo.texi (Comments):
* texinfo/texinfo.texi (Minimum):
* texinfo/texinfo.texi (Six Parts):
* texinfo/texinfo.texi (Short Sample):
* texinfo/texinfo.texi (History):
* texinfo/texinfo.texi (Texinfo Mode):
* texinfo/texinfo.texi (Texinfo Mode Overview):
* texinfo/texinfo.texi (XEmacs Editing):
* texinfo/texinfo.texi (Inserting):
* texinfo/texinfo.texi (Showing the Structure):
* texinfo/texinfo.texi (Updating Nodes and Menus):
* texinfo/texinfo.texi (Updating Commands):
* texinfo/texinfo.texi (Updating Requirements):
* texinfo/texinfo.texi (Other Updating Commands):
* texinfo/texinfo.texi (Info Formatting):
* texinfo/texinfo.texi (Printing):
* texinfo/texinfo.texi (Texinfo Mode Summary):
* texinfo/texinfo.texi (Beginning a File):
* texinfo/texinfo.texi (Sample Beginning):
* texinfo/texinfo.texi (Texinfo File Header):
* texinfo/texinfo.texi (First Line):
* texinfo/texinfo.texi (Start of Header):
* texinfo/texinfo.texi (setfilename):
* texinfo/texinfo.texi (settitle):
* texinfo/texinfo.texi (End of Header):
* texinfo/texinfo.texi (Document Permissions):
* texinfo/texinfo.texi (copying):
* texinfo/texinfo.texi (insertcopying):
* texinfo/texinfo.texi (Titlepage & Copyright Page):
* texinfo/texinfo.texi (titlepage):
* texinfo/texinfo.texi (titlefont center sp):
* texinfo/texinfo.texi (title subtitle author):
* texinfo/texinfo.texi (Copyright):
* texinfo/texinfo.texi (end titlepage):
* texinfo/texinfo.texi (headings on off):
* texinfo/texinfo.texi (Contents):
* texinfo/texinfo.texi (The Top Node):
* texinfo/texinfo.texi (Top Node Example):
* texinfo/texinfo.texi (Master Menu Parts):
* texinfo/texinfo.texi (Global Document Commands):
* texinfo/texinfo.texi (documentdescription):
* texinfo/texinfo.texi (setchapternewpage):
* texinfo/texinfo.texi (paragraphindent):
* texinfo/texinfo.texi (firstparagraphindent):
* texinfo/texinfo.texi (exampleindent):
* texinfo/texinfo.texi (Software Copying Permissions):
* texinfo/texinfo.texi (Ending a File):
* texinfo/texinfo.texi (Printing Indices & Menus):
* texinfo/texinfo.texi (File End):
* texinfo/texinfo.texi (Structuring):
* texinfo/texinfo.texi (Tree Structuring):
* texinfo/texinfo.texi (Structuring Command Types):
* texinfo/texinfo.texi (makeinfo top):
* texinfo/texinfo.texi (chapter):
* texinfo/texinfo.texi (unnumbered & appendix):
* texinfo/texinfo.texi (majorheading & chapheading):
* texinfo/texinfo.texi (section):
* texinfo/texinfo.texi (unnumberedsec appendixsec heading):
* texinfo/texinfo.texi (subsection):
* texinfo/texinfo.texi (unnumberedsubsec appendixsubsec subheading):
* texinfo/texinfo.texi (subsubsection):
* texinfo/texinfo.texi (Raise/lower sections):
* texinfo/texinfo.texi (Nodes):
* texinfo/texinfo.texi (Two Paths):
* texinfo/texinfo.texi (Node Menu Illustration):
* texinfo/texinfo.texi (node):
* texinfo/texinfo.texi (Node Names):
* texinfo/texinfo.texi (Writing a Node):
* texinfo/texinfo.texi (Node Line Tips):
* texinfo/texinfo.texi (Node Line Requirements):
* texinfo/texinfo.texi (First Node):
* texinfo/texinfo.texi (makeinfo top command):
* texinfo/texinfo.texi (makeinfo Pointer Creation):
* texinfo/texinfo.texi (anchor):
* texinfo/texinfo.texi (Menus):
* texinfo/texinfo.texi (Menu Location):
* texinfo/texinfo.texi (Writing a Menu):
* texinfo/texinfo.texi (Menu Parts):
* texinfo/texinfo.texi (Less Cluttered Menu Entry):
* texinfo/texinfo.texi (Menu Example):
* texinfo/texinfo.texi (Other Info Files):
* texinfo/texinfo.texi (Cross References):
* texinfo/texinfo.texi (References):
* texinfo/texinfo.texi (Cross Reference Commands):
* texinfo/texinfo.texi (Cross Reference Parts):
* texinfo/texinfo.texi (xref):
* texinfo/texinfo.texi (Reference Syntax):
* texinfo/texinfo.texi (One Argument):
* texinfo/texinfo.texi (Two Arguments):
* texinfo/texinfo.texi (Three Arguments):
* texinfo/texinfo.texi (Four and Five Arguments):
* texinfo/texinfo.texi (Top Node Naming):
* texinfo/texinfo.texi (ref):
* texinfo/texinfo.texi (pxref):
* texinfo/texinfo.texi (inforef):
* texinfo/texinfo.texi (uref):
* texinfo/texinfo.texi (cite):
* texinfo/texinfo.texi (Marking Text):
* texinfo/texinfo.texi (Indicating):
* texinfo/texinfo.texi (Useful Highlighting):
* texinfo/texinfo.texi (code):
* texinfo/texinfo.texi (kbd):
* texinfo/texinfo.texi (key):
* texinfo/texinfo.texi (samp):
* texinfo/texinfo.texi (verb):
* texinfo/texinfo.texi (var):
* texinfo/texinfo.texi (env):
* texinfo/texinfo.texi (file):
* texinfo/texinfo.texi (command):
* texinfo/texinfo.texi (option):
* texinfo/texinfo.texi (dfn):
* texinfo/texinfo.texi (abbr):
* texinfo/texinfo.texi (acronym):
* texinfo/texinfo.texi (indicateurl):
* texinfo/texinfo.texi (email):
* texinfo/texinfo.texi (Emphasis):
* texinfo/texinfo.texi (emph & strong):
* texinfo/texinfo.texi (Smallcaps):
* texinfo/texinfo.texi (Fonts):
* texinfo/texinfo.texi (Quotations and Examples):
* texinfo/texinfo.texi (Block Enclosing Commands):
* texinfo/texinfo.texi (quotation):
* texinfo/texinfo.texi (example):
* texinfo/texinfo.texi (verbatim):
* texinfo/texinfo.texi (verbatiminclude):
* texinfo/texinfo.texi (lisp):
* texinfo/texinfo.texi (small):
* texinfo/texinfo.texi (display):
* texinfo/texinfo.texi (format):
* texinfo/texinfo.texi (exdent):
* texinfo/texinfo.texi (flushleft & flushright):
* texinfo/texinfo.texi (noindent):
* texinfo/texinfo.texi (indent):
* texinfo/texinfo.texi (cartouche):
* texinfo/texinfo.texi (Lists and Tables):
* texinfo/texinfo.texi (Introducing Lists):
* texinfo/texinfo.texi (itemize):
* texinfo/texinfo.texi (enumerate):
* texinfo/texinfo.texi (Two-column Tables):
* texinfo/texinfo.texi (table):
* texinfo/texinfo.texi (ftable vtable):
* texinfo/texinfo.texi (itemx):
* texinfo/texinfo.texi (Multi-column Tables):
* texinfo/texinfo.texi (Multitable Column Widths):
* texinfo/texinfo.texi (Multitable Rows):
* texinfo/texinfo.texi (Special Displays):
* texinfo/texinfo.texi (Floats):
* texinfo/texinfo.texi (float):
* texinfo/texinfo.texi (caption shortcaption):
* texinfo/texinfo.texi (listoffloats):
* texinfo/texinfo.texi (Images):
* texinfo/texinfo.texi (Image Syntax):
* texinfo/texinfo.texi (Image Scaling):
* texinfo/texinfo.texi (Footnotes):
* texinfo/texinfo.texi (Footnote Commands):
* texinfo/texinfo.texi (Footnote Styles):
* texinfo/texinfo.texi (Indices):
* texinfo/texinfo.texi (Index Entries):
* texinfo/texinfo.texi (Predefined Indices):
* texinfo/texinfo.texi (Indexing Commands):
* texinfo/texinfo.texi (Combining Indices):
* texinfo/texinfo.texi (syncodeindex):
* texinfo/texinfo.texi (synindex):
* texinfo/texinfo.texi (New Indices):
* texinfo/texinfo.texi (Insertions):
* texinfo/texinfo.texi (Atsign Braces Comma):
* texinfo/texinfo.texi (Inserting an Atsign):
* texinfo/texinfo.texi (Inserting Braces):
* texinfo/texinfo.texi (Inserting a Comma):
* texinfo/texinfo.texi (Inserting Quote Characters):
* texinfo/texinfo.texi (Inserting Space):
* texinfo/texinfo.texi (Not Ending a Sentence):
* texinfo/texinfo.texi (Ending a Sentence):
* texinfo/texinfo.texi (Multiple Spaces):
* texinfo/texinfo.texi (frenchspacing):
* texinfo/texinfo.texi (dmn):
* texinfo/texinfo.texi (Inserting Accents):
* texinfo/texinfo.texi (Inserting Quotation Marks):
* texinfo/texinfo.texi (Dots Bullets):
* texinfo/texinfo.texi (dots):
* texinfo/texinfo.texi (bullet):
* texinfo/texinfo.texi (TeX and copyright):
* texinfo/texinfo.texi (tex):
* texinfo/texinfo.texi (copyright symbol):
* texinfo/texinfo.texi (registered symbol):
* texinfo/texinfo.texi (euro):
* texinfo/texinfo.texi (pounds):
* texinfo/texinfo.texi (textdegree):
* texinfo/texinfo.texi (minus):
* texinfo/texinfo.texi (geq leq):
* texinfo/texinfo.texi (math):
* texinfo/texinfo.texi (Click Sequences):
* texinfo/texinfo.texi (Glyphs):
* texinfo/texinfo.texi (Glyphs Summary):
* texinfo/texinfo.texi (result):
* texinfo/texinfo.texi (expansion):
* texinfo/texinfo.texi (Print Glyph):
* texinfo/texinfo.texi (Error Glyph):
* texinfo/texinfo.texi (Equivalence):
* texinfo/texinfo.texi (Point Glyph):
* texinfo/texinfo.texi (Breaks):
* texinfo/texinfo.texi (Break Commands):
* texinfo/texinfo.texi (Line Breaks):
* texinfo/texinfo.texi (- and hyphenation):
* texinfo/texinfo.texi (allowcodebreaks):
* texinfo/texinfo.texi (w):
* texinfo/texinfo.texi (tie):
* texinfo/texinfo.texi (sp):
* texinfo/texinfo.texi (page):
* texinfo/texinfo.texi (group):
* texinfo/texinfo.texi (need):
* texinfo/texinfo.texi (Definition Commands):
* texinfo/texinfo.texi (Def Cmd Template):
* texinfo/texinfo.texi (Def Cmd Continuation Lines):
* texinfo/texinfo.texi (Optional Arguments):
* texinfo/texinfo.texi (deffnx):
* texinfo/texinfo.texi (Def Cmds in Detail):
* texinfo/texinfo.texi (Functions Commands):
* texinfo/texinfo.texi (Variables Commands):
* texinfo/texinfo.texi (Typed Functions):
* texinfo/texinfo.texi (Typed Variables):
* texinfo/texinfo.texi (Data Types):
* texinfo/texinfo.texi (Abstract Objects):
* texinfo/texinfo.texi (Object-Oriented Variables):
* texinfo/texinfo.texi (Object-Oriented Methods):
* texinfo/texinfo.texi (Defining Macros):
* texinfo/texinfo.texi (Invoking Macros):
* texinfo/texinfo.texi (Macro Details):
* texinfo/texinfo.texi (alias):
* texinfo/texinfo.texi (definfoenclose):
* texinfo/texinfo.texi (Hardcopy):
* texinfo/texinfo.texi (Use TeX):
* texinfo/texinfo.texi (Format with tex/texindex):
* texinfo/texinfo.texi (Format with texi2dvi):
* texinfo/texinfo.texi (Print with lpr):
* texinfo/texinfo.texi (Within XEmacs):
* texinfo/texinfo.texi (Texinfo Mode Printing):
* texinfo/texinfo.texi (Compile-Command):
* texinfo/texinfo.texi (Requirements Summary):
* texinfo/texinfo.texi (Preparing for TeX):
* texinfo/texinfo.texi (Overfull hboxes):
* texinfo/texinfo.texi (smallbook):
* texinfo/texinfo.texi (A4 Paper):
* texinfo/texinfo.texi (pagesizes):
* texinfo/texinfo.texi (Cropmarks and Magnification):
* texinfo/texinfo.texi (PDF Output):
* texinfo/texinfo.texi (Obtaining TeX):
* texinfo/texinfo.texi (Creating and Installing Info Files):
* texinfo/texinfo.texi (Creating an Info File):
* texinfo/texinfo.texi (makeinfo advantages):
* texinfo/texinfo.texi (Invoking makeinfo):
* texinfo/texinfo.texi (makeinfo options):
* texinfo/texinfo.texi (Pointer Validation):
* texinfo/texinfo.texi (makeinfo in XEmacs):
* texinfo/texinfo.texi (texinfo-format commands):
* texinfo/texinfo.texi (Batch Formatting):
* texinfo/texinfo.texi (Tag and Split Files):
* texinfo/texinfo.texi (Installing an Info File):
* texinfo/texinfo.texi (Directory File):
* texinfo/texinfo.texi (New Info File):
* texinfo/texinfo.texi (Other Info Directories):
* texinfo/texinfo.texi (Installing Dir Entries):
* texinfo/texinfo.texi (Invoking install-info):
* texinfo/texinfo.texi (Generating HTML):
* texinfo/texinfo.texi (HTML Translation):
* texinfo/texinfo.texi (HTML Splitting):
* texinfo/texinfo.texi (HTML CSS):
* texinfo/texinfo.texi (HTML Xref):
* texinfo/texinfo.texi (HTML Xref Link Basics):
* texinfo/texinfo.texi (HTML Xref Node Name Expansion):
* texinfo/texinfo.texi (HTML Xref Command Expansion):
* texinfo/texinfo.texi (HTML Xref 8-bit Character Expansion):
* texinfo/texinfo.texi (HTML Xref Mismatch):
* texinfo/texinfo.texi (Command List):
* texinfo/texinfo.texi (Command Syntax):
* texinfo/texinfo.texi (Tips):
* texinfo/texinfo.texi (Sample Texinfo Files):
* texinfo/texinfo.texi (Short Sample Texinfo File):
* texinfo/texinfo.texi (GNU Sample Texts):
* texinfo/texinfo.texi (Invoking sample):
* texinfo/texinfo.texi (GNU Free Documentation License):
* texinfo/texinfo.texi (Index):
* texinfo/texinfo.texi (Verbatim Copying License):
* texinfo/texinfo.texi (All-permissive Copying License):
* texinfo/texinfo.texi (Include Files):
* texinfo/texinfo.texi (Using Include Files):
* texinfo/texinfo.texi (texinfo-multiple-files-update):
* texinfo/texinfo.texi (Include Files Requirements):
* texinfo/texinfo.texi (Sample Include File):
* texinfo/texinfo.texi (Include Files Evolution):
* texinfo/texinfo.texi (Headings):
* texinfo/texinfo.texi (Headings Introduced):
* texinfo/texinfo.texi (Heading Format):
* texinfo/texinfo.texi (Heading Choice):
* texinfo/texinfo.texi (Custom Headings):
* texinfo/texinfo.texi (Catching Mistakes):
* texinfo/texinfo.texi (makeinfo Preferred):
* texinfo/texinfo.texi (Debugging with Info):
* texinfo/texinfo.texi (Debugging with TeX):
* texinfo/texinfo.texi (Using texinfo-show-structure):
* texinfo/texinfo.texi (Using occur):
* texinfo/texinfo.texi (Running Info-Validate):
* texinfo/texinfo.texi (Using Info-validate):
* texinfo/texinfo.texi (Unsplit):
* texinfo/texinfo.texi (Tagifying):
* texinfo/texinfo.texi (Splitting):
* texinfo/texinfo.texi (Refilling Paragraphs):
* texinfo/texinfo.texi (Command and Variable Index):
* texinfo/texinfo.texi (General Index):
* texinfo/version.texi: New file.
Sync with FSF 23.1.92. Make new directory to hold the files needed
to generate texinfo.info, since there are three such files now.
2010-02-19 Ben Wing <ben@xemacs.org>
* Makefile:
* Makefile (src_files1):
* Makefile (DIR):
* Makefile (texinfo-srcs):
* Makefile ($(INFODIR)/widget.info):
* Makefile ($(INFODIR)/texinfo.info):
* Makefile (.PHONY):
* Makefile (texinfo.dvi):
* Makefile (texinfo.pdf):
* Makefile ($(HTMLDIR)/widget.html):
* Makefile ($(HTMLDIR)/texinfo.html):
Incorporate texinfo.texi moving to a subdirectory texinfo/.
Do some tricks to reduce the amount of duplication while still
maintaining compatible with non-GNU make (at least, with
Solaris make).
* doclicense.texi: New file.
* info.texi:
* info.texi (Top):
* info.texi (Getting Started):
* info.texi (Help-Small-Screen):
* info.texi (Help):
* info.texi (Help-P):
* info.texi (Help-^L):
* info.texi (Help-Inv):
* info.texi (Help-]):
* info.texi (Help-M):
* info.texi (Help-FOO):
* info.texi (Help-Xref):
* info.texi (Help-Int):
* info.texi (Help-Q):
* info.texi (Advanced):
* info.texi (Search Text):
* info.texi (Search Index):
* info.texi (Go to node):
* info.texi (Choose menu subtopic):
* info.texi (Create Info buffer):
* info.texi (XEmacs Info Variables):
* info.texi (Expert Info):
* info.texi (Add):
* info.texi (Menus):
* info.texi (Cross-refs):
* info.texi (Help-Cross):
* info.texi (Tags):
* info.texi (Checking):
* info.texi (Index):
* texinfo.tex:
* texinfo.tex (paragraphindent{%):
* texinfo.tex (sectionheading will have):
* texinfo.tex (chapterzzz{#3}%):
* texinfo.tex (subsubsection = \numberedsubsubsec):
* texinfo.tex (subsubsection = \appendixsubsubsec):
* texinfo.tex (subsubsection = \unnumberedsubsubsec):
* texinfo.tex (sectionheading{#1}{sec}{Ynumbered}{\the\chapno.\the\secno}%):
* texinfo.tex (sectionheading{#1}{sec}{Yappendix}{\appendixletter.\the\secno}%):
* texinfo.tex (sectionheading{#1}{sec}{Ynothing}{\the\unnumberedno.\the\secno}%):
* texinfo.tex (sectionheading{#1}{subsec}{Ynumbered}{\the\chapno.\the\secno.\the\subsecno}%):
* texinfo.tex (sectionheading{#1}{subsec}{Yappendix}%):
* texinfo.tex (sectionheading{#1}{subsec}{Ynothing}%):
* texinfo.tex (sectionheading{#1}{subsubsec}{Ynumbered}%):
* texinfo.tex (sectionheading{#1}{subsubsec}{Yappendix}%):
* texinfo.tex (sectionheading{#1}{subsubsec}{Ynothing}%):
* texinfo.tex (sectionheading{#1}{subsubsec}{Yomitfromtoc}{}):
* texinfo.tex (sectionheading to do the printing.):
* texinfo.tex (sectionlevel}{#1}{#4}%):
* texinfo.tex (sectionheading, q.v.):
Sync with FSF 23.1.92.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Fri, 19 Feb 2010 22:39:19 -0600 |
| parents | ecf1ebac70d8 |
| children | 308d34e9f07d |
line wrap: on
line source
/* undo handling for XEmacs. Copyright (C) 1990, 1992, 1993, 1994 Free Software Foundation, Inc. This file is part of XEmacs. XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: FSF 19.28. */ /* This file has been Mule-ized. */ #include <config.h> #include "lisp.h" #include "buffer.h" #include "extents.h" /* Maintained in event-stream.c */ extern Charbpos last_point_position; extern Lisp_Object last_point_position_buffer; /* Extent code needs to know about undo because the behavior of insert() with regard to extents varies depending on whether we are inside an undo or not. */ int inside_undo; /* Last buffer for which undo information was recorded. */ static Lisp_Object last_undo_buffer; Lisp_Object Qinhibit_read_only; /* The first time a command records something for undo. it also allocates the undo-boundary object which will be added to the list at the end of the command. This ensures we can't run out of space while trying to make an undo-boundary. */ static Lisp_Object pending_boundary; static void undo_boundary (struct buffer *b) { Lisp_Object tem = Fcar (b->undo_list); if (!NILP (tem)) { /* One way or another, cons nil onto the front of the undo list. */ if (CONSP (pending_boundary)) { /* If we have preallocated the cons cell to use here, use that one. */ XCDR (pending_boundary) = b->undo_list; b->undo_list = pending_boundary; pending_boundary = Qnil; } else b->undo_list = Fcons (Qnil, b->undo_list); } } static int undo_prelude (struct buffer *b, int hack_pending_boundary) { if (EQ (b->undo_list, Qt)) return (0); if (NILP (last_undo_buffer) || (BUFFER_BASE_BUFFER (b) != BUFFER_BASE_BUFFER (XBUFFER (last_undo_buffer)))) { undo_boundary (b); last_undo_buffer = wrap_buffer (b); } /* Allocate a cons cell to be the undo boundary after this command. */ if (hack_pending_boundary && NILP (pending_boundary)) pending_boundary = Fcons (Qnil, Qnil); if (BUF_MODIFF (b) <= BUF_SAVE_MODIFF (b)) { /* Record that an unmodified buffer is about to be changed. Record the file modification date so that when undoing this entry we can tell whether it is obsolete because the file was saved again. */ b->undo_list = Fcons (Fcons (Qt, Fcons (make_int ((b->modtime >> 16) & 0xffff), make_int (b->modtime & 0xffff))), b->undo_list); } return 1; } /* Record an insertion that just happened or is about to happen, for LENGTH characters at position BEG. (It is possible to record an insertion before or after the fact because we don't need to record the contents.) */ void record_insert (struct buffer *b, Charbpos beg, Charcount length) { if (!undo_prelude (b, 1)) return; /* If this is following another insertion and consecutive with it in the buffer, combine the two. */ if (CONSP (b->undo_list)) { Lisp_Object elt; elt = XCAR (b->undo_list); if (CONSP (elt) && INTP (XCAR (elt)) && INTP (XCDR (elt)) && XINT (XCDR (elt)) == beg) { XCDR (elt) = make_int (beg + length); return; } } b->undo_list = Fcons (Fcons (make_int (beg), make_int (beg + length)), b->undo_list); } /* Record that a deletion is about to take place, for LENGTH characters at location BEG. */ void record_delete (struct buffer *b, Charbpos beg, Charcount length) { /* This function can GC */ Lisp_Object sbeg; int at_boundary; if (!undo_prelude (b, 1)) return; at_boundary = (CONSP (b->undo_list) && NILP (XCAR (b->undo_list))); if (BUF_PT (b) == beg + length) sbeg = make_int (-beg); else sbeg = make_int (beg); /* If we are just after an undo boundary, and point wasn't at start of deleted range, record where it was. */ if (at_boundary && BUFFERP (last_point_position_buffer) && b == XBUFFER (last_point_position_buffer) && last_point_position != XINT (sbeg)) b->undo_list = Fcons (make_int (last_point_position), b->undo_list); b->undo_list = Fcons (Fcons (make_string_from_buffer (b, beg, length), sbeg), b->undo_list); } /* Record that a replacement is about to take place, for LENGTH characters at location BEG. The replacement does not change the number of characters. */ void record_change (struct buffer *b, Charbpos beg, Charcount length) { record_delete (b, beg, length); record_insert (b, beg, length); } /* Record that an EXTENT is about to be attached or detached in its buffer. This works much like a deletion or insertion, except that there's no string. The tricky part is that the buffer we operate on comes from EXTENT. Most extent changes happen as a side effect of string insertion and deletion; this call is solely for Fdetach_extent() and Finsert_extent(). */ void record_extent (Lisp_Object extent, int attached) { Lisp_Object obj = Fextent_object (extent); if (BUFFERP (obj)) { Lisp_Object token; struct buffer *b = XBUFFER (obj); if (!undo_prelude (b, 1)) return; if (attached) token = extent; else token = list3 (extent, Fextent_start_position (extent), Fextent_end_position (extent)); b->undo_list = Fcons (token, b->undo_list); } else return; } #if 0 /* FSFmacs */ /* Record a change in property PROP (whose old value was VAL) for LENGTH characters starting at position BEG in BUFFER. */ record_property_change (Charbpos beg, Charcount length, Lisp_Object prop, Lisp_Object value, Lisp_Object buffer) { Lisp_Object lbeg, lend, entry; struct buffer *b = XBUFFER (buffer); if (!undo_prelude (b, 1)) return; lbeg = make_int (beg); lend = make_int (beg + length); entry = Fcons (Qnil, Fcons (prop, Fcons (value, Fcons (lbeg, lend)))); b->undo_list = Fcons (entry, b->undo_list); } #endif /* FSFmacs */ DEFUN ("undo-boundary", Fundo_boundary, 0, 0, 0, /* Mark a boundary between units of undo. An undo command will stop at this point, but another undo command will undo to the previous boundary. */ ()) { if (EQ (current_buffer->undo_list, Qt)) return Qnil; undo_boundary (current_buffer); return Qnil; } /* At garbage collection time, make an undo list shorter at the end, returning the truncated list. MINSIZE and MAXSIZE are the limits on size allowed, as described below. In practice, these are the values of undo-threshold and undo-high-threshold. */ Lisp_Object truncate_undo_list (Lisp_Object list, int minsize, int maxsize) { Lisp_Object prev, next, last_boundary; int size_so_far = 0; if (!(minsize > 0 || maxsize > 0)) return list; prev = Qnil; next = list; last_boundary = Qnil; if (!CONSP (list)) return (list); /* Always preserve at least the most recent undo record. If the first element is an undo boundary, skip past it. */ if (CONSP (next) && NILP (XCAR (next))) { /* Add in the space occupied by this element and its chain link. */ size_so_far += sizeof (Lisp_Cons); /* Advance to next element. */ prev = next; next = XCDR (next); } while (CONSP (next) && !NILP (XCAR (next))) { Lisp_Object elt; elt = XCAR (next); /* Add in the space occupied by this element and its chain link. */ size_so_far += sizeof (Lisp_Cons); if (CONSP (elt)) { size_so_far += sizeof (Lisp_Cons); if (STRINGP (XCAR (elt))) size_so_far += (sizeof (Lisp_String) - 1 + XSTRING_LENGTH (XCAR (elt))); } /* Advance to next element. */ prev = next; next = XCDR (next); } if (CONSP (next)) last_boundary = prev; while (CONSP (next)) { Lisp_Object elt; elt = XCAR (next); /* When we get to a boundary, decide whether to truncate either before or after it. The lower threshold, MINSIZE, tells us to truncate after it. If its size pushes past the higher threshold MAXSIZE as well, we truncate before it. */ if (NILP (elt)) { if (size_so_far > maxsize && maxsize > 0) break; last_boundary = prev; if (size_so_far > minsize && minsize > 0) break; } /* Add in the space occupied by this element and its chain link. */ size_so_far += sizeof (Lisp_Cons); if (CONSP (elt)) { size_so_far += sizeof (Lisp_Cons); if (STRINGP (XCAR (elt))) size_so_far += (sizeof (Lisp_String) - 1 + XSTRING_LENGTH (XCAR (elt))); } /* Advance to next element. */ prev = next; next = XCDR (next); } /* If we scanned the whole list, it is short enough; don't change it. */ if (NILP (next)) return list; /* Truncate at the boundary where we decided to truncate. */ if (!NILP (last_boundary)) { XCDR (last_boundary) = Qnil; return list; } else return Qnil; } DEFUN ("primitive-undo", Fprimitive_undo, 2, 2, 0, /* Undo COUNT records from the front of the list LIST. Return what remains of the list. */ (count, list)) { struct gcpro gcpro1, gcpro2; Lisp_Object next = Qnil; /* This function can GC */ int arg; int speccount = internal_bind_int (&inside_undo, 1); #if 0 /* This is a good feature, but would make undo-start unable to do what is expected. */ Lisp_Object tem; /* If the head of the list is a boundary, it is the boundary preceding this command. Get rid of it and don't count it. */ tem = Fcar (list); if (NILP (tem)) list = Fcdr (list); #endif CHECK_INT (count); arg = XINT (count); next = Qnil; GCPRO2 (next, list); /* Don't let read-only properties interfere with undo. */ if (NILP (current_buffer->read_only)) specbind (Qinhibit_read_only, Qt); while (arg > 0) { while (1) { if (NILP (list)) break; else if (!CONSP (list)) goto rotten; next = XCAR (list); list = XCDR (list); /* Exit inner loop at undo boundary. */ if (NILP (next)) break; /* Handle an integer by setting point to that value. */ else if (INTP (next)) BUF_SET_PT (current_buffer, charbpos_clip_to_bounds (BUF_BEGV (current_buffer), XINT (next), BUF_ZV (current_buffer))); else if (CONSP (next)) { Lisp_Object car = XCAR (next); Lisp_Object cdr = XCDR (next); if (EQ (car, Qt)) { /* Element (t high . low) records previous modtime. */ Lisp_Object high, low; int mod_time; if (!CONSP (cdr)) goto rotten; high = XCAR (cdr); low = XCDR (cdr); if (!INTP (high) || !INTP (low)) goto rotten; mod_time = (XINT (high) << 16) + XINT (low); /* If this records an obsolete save (not matching the actual disk file) then don't mark unmodified. */ if (mod_time != current_buffer->modtime) break; #ifdef CLASH_DETECTION Funlock_buffer (); #endif /* CLASH_DETECTION */ /* #### need to check if this can GC */ Fset_buffer_modified_p (Qnil, Qnil); } else if (EXTENTP (car)) { /* Element (extent start end) means that EXTENT was detached, and we need to reattach it. */ Lisp_Object extent_obj, start, end; extent_obj = car; start = Fcar (cdr); end = Fcar (Fcdr (cdr)); if (!INTP (start) || !INTP (end)) goto rotten; Fset_extent_endpoints (extent_obj, start, end, Fcurrent_buffer ()); } #if 0 /* FSFmacs */ else if (EQ (car, Qnil)) { /* Element (nil prop val beg . end) is property change. */ Lisp_Object beg, end, prop, val; prop = Fcar (cdr); cdr = Fcdr (cdr); val = Fcar (cdr); cdr = Fcdr (cdr); beg = Fcar (cdr); end = Fcdr (cdr); Fput_text_property (beg, end, prop, val, Qnil); } #endif /* FSFmacs */ else if (INTP (car) && INTP (cdr)) { /* Element (BEG . END) means range was inserted. */ if (XINT (car) < BUF_BEGV (current_buffer) || XINT (cdr) > BUF_ZV (current_buffer)) signal_error (Qinvalid_operation, "Changes to be undone are outside visible portion of buffer", Qunbound); /* Set point first thing, so that undoing this undo does not send point back to where it is now. */ Fgoto_char (car, Qnil); Fdelete_region (car, cdr, Qnil); } else if (STRINGP (car) && INTP (cdr)) { /* Element (STRING . POS) means STRING was deleted. */ Lisp_Object membuf = car; int pos = XINT (cdr); if (pos < 0) { if (-pos < BUF_BEGV (current_buffer) || -pos > BUF_ZV (current_buffer)) signal_error (Qinvalid_operation, "Changes to be undone are outside visible portion of buffer", Qunbound); BUF_SET_PT (current_buffer, -pos); Finsert (1, &membuf); } else { if (pos < BUF_BEGV (current_buffer) || pos > BUF_ZV (current_buffer)) signal_error (Qinvalid_operation, "Changes to be undone are outside visible portion of buffer", Qunbound); BUF_SET_PT (current_buffer, pos); /* Insert before markers so that if the mark is currently on the boundary of this deletion, it ends up on the other side of the now-undeleted text from point. Since undo doesn't even keep track of the mark, this isn't really necessary, but it may lead to better behavior in certain situations. I'm doubtful that this is safe; you could mess up the process-output mark in shell buffers, so until I hear a compelling reason for this change, I'm leaving it out. -jwz */ /* Finsert_before_markers (1, &membuf); */ Finsert (1, &membuf); BUF_SET_PT (current_buffer, pos); } } else { goto rotten; } } else if (EXTENTP (next)) Fdetach_extent (next); else { rotten: signal_continuable_error (Qinvalid_state, "Something rotten in the state of undo", next); } } arg--; } UNGCPRO; return unbind_to_1 (speccount, list); } void syms_of_undo (void) { DEFSUBR (Fprimitive_undo); DEFSUBR (Fundo_boundary); DEFSYMBOL (Qinhibit_read_only); } void reinit_vars_of_undo (void) { inside_undo = 0; } void vars_of_undo (void) { pending_boundary = Qnil; staticpro (&pending_boundary); last_undo_buffer = Qnil; staticpro (&last_undo_buffer); }
