Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-10

Merge from emacs--cvs-trunk--0

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-59
 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-68
   Update from CVS

7 files changed, 94 insertions, 17 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 3bb83dc10e2..397a34f1be4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,38 @@
+2005-02-01  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (back_to_previous_visible_line_start): Reset iterator
+        stack before calling handle_display_prop.
+
+2005-01-31  Kim F. Storm  <storm@cua.dk>
+
+        * undo.c (Qapply): New lisp var.
+        (syms_of_undo): Intern and staticpro it.
+        (Fprimitive_undo): Support formats (apply FUNNAME . ARGS) and
+        (apply DELTA BEG END FUNNAME . ARGS) instead of (FUNNAME . ARGS).
+
+        * buffer.c (syms_of_buffer) <buffer-undo-list>: Doc fix.
+
+2005-01-30  Jesper Harder  <harder@phys.au.dk>
+
+        * macterm.c (syms_of_macterm) <mac-reverse-ctrl-meta>
+        <mac-emulate-three-button-mouse>: Fix docstring indentation.
+
+2005-01-29  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * undo.c (syms_of_undo) <undo-outer-limit>: Doc update.
+        Increase value to 3 Meg.
+
+2005-01-29  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * xfns.c (show_hourglass): Use FRAME_X_WINDOW as parent for GTK,
+        button events are not received otherwise.
+
+2005-01-29  Richard M. Stallman  <rms@gnu.org>
+
+        * buffer.c (syms_of_buffer) <buffer-undo-list>: Doc fix.
+
+        * undo.c (Fprimitive_undo): Handle (FUNNAME . ARGS) by calling FUNNAME.
+
 2005-01-28  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * keymap.c (access_keymap): YAILOM.
diff --git a/src/buffer.c b/src/buffer.c
index e0fde514ca4..d869388ec72 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -5798,6 +5798,14 @@ An entry (nil PROPERTY VALUE BEG . END) indicates that a text property
 was modified between BEG and END.  PROPERTY is the property name,
 and VALUE is the old value.
 
+An entry (apply FUN-NAME . ARGS) means undo the change with
+\(apply FUN-NAME ARGS).
+
+An entry (apply DELTA BEG END FUN-NAME . ARGS) supports selective undo
+in the active region.  BEG and END is the range affected by this entry
+and DELTA is the number of bytes added or deleted in that range by
+this change.
+
 An entry (MARKER . DISTANCE) indicates that the marker MARKER
 was adjusted in position by the offset DISTANCE (an integer).
 
diff --git a/src/casetab.c b/src/casetab.c
index af0b238029a..63f29666a50 100644
--- a/src/casetab.c
+++ b/src/casetab.c
@@ -18,7 +18,7 @@ along with GNU Emacs; see the file COPYING.  If not, write to
 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-/* Written by Howard Gayle.  See chartab.c for details. */
+/* Written by Howard Gayle.  */
 
 #include <config.h>
 #include "lisp.h"
diff --git a/src/macterm.c b/src/macterm.c
index aeed88013e5..5a7db8e04e2 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -9928,18 +9928,18 @@ nil then the key will act as the normal Mac option modifier.  */);
 
   DEFVAR_LISP ("mac-reverse-ctrl-meta", &Vmac_reverse_ctrl_meta,
     doc: /* Non-nil means that the control and meta keys are reversed.  This is
-            useful for non-standard keyboard layouts.  */);
+useful for non-standard keyboard layouts.  */);
   Vmac_reverse_ctrl_meta = Qnil;
 
   DEFVAR_LISP ("mac-emulate-three-button-mouse",
                &Vmac_emulate_three_button_mouse,
     doc: /* t means that when the option-key is held down while pressing the
-    mouse button, the click will register as mouse-2 and while the
-    command-key is held down, the click will register as mouse-3.
-    'reverse means that the the option-key will register for mouse-3
-    and the command-key will register for mouse-2.  nil means that
-    not emulation should be done and the modifiers should be placed
-    on the mouse-1 event. */);
+mouse button, the click will register as mouse-2 and while the
+command-key is held down, the click will register as mouse-3.
+'reverse means that the the option-key will register for mouse-3
+and the command-key will register for mouse-2.  nil means that
+no emulation should be done and the modifiers should be placed
+on the mouse-1 event. */);
   Vmac_emulate_three_button_mouse = Qnil;
 
 #if USE_CARBON_EVENTS
diff --git a/src/undo.c b/src/undo.c
index df4b8d08cd6..ea4f35397a9 100644
--- a/src/undo.c
+++ b/src/undo.c
@@ -40,6 +40,10 @@ Lisp_Object last_undo_buffer;
 
 Lisp_Object Qinhibit_read_only;
 
+/* Marker for function call undo list elements.  */
+
+Lisp_Object Qapply;
+
 /* 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.
@@ -519,7 +523,7 @@ Return what remains of the list.  */)
                 }
               else if (EQ (car, Qnil))
                 {
-                  /* Element (nil prop val beg . end) is property change.  */
+                  /* Element (nil PROP VAL BEG . END) is property change.  */
                   Lisp_Object beg, end, prop, val;
 
                   prop = Fcar (cdr);
@@ -543,6 +547,26 @@ Return what remains of the list.  */)
                   Fgoto_char (car);
                   Fdelete_region (car, cdr);
                 }
+              else if (EQ (car, Qapply))
+                {
+                  Lisp_Object oldlist = current_buffer->undo_list;
+                  /* Element (apply FUNNAME . ARGS) means call FUNNAME to undo.  */
+                  car = Fcar (cdr);
+                  if (INTEGERP (car))
+                    {
+                      /* Long format: (apply DELTA START END FUNNAME . ARGS).  */
+                      cdr = Fcdr (Fcdr (Fcdr (cdr)));
+                      car = Fcar (cdr);
+                    }
+                  cdr = Fcdr (cdr);
+                  apply1 (car, cdr);
+                  /* Make sure this produces at least one undo entry,
+                     so the test in `undo' for continuing an undo series
+                     will work right.  */
+                  if (EQ (oldlist, current_buffer->undo_list))
+                    current_buffer->undo_list
+                      = Fcons (list2 (Qcdr, Qnil), current_buffer->undo_list);
+                }
               else if (STRINGP (car) && INTEGERP (cdr))
                 {
                   /* Element (STRING . POS) means STRING was deleted.  */
@@ -589,13 +613,16 @@ Return what remains of the list.  */)
   UNGCPRO;
   return unbind_to (count, list);
 }
-
+
 void
 syms_of_undo ()
 {
   Qinhibit_read_only = intern ("inhibit-read-only");
   staticpro (&Qinhibit_read_only);
 
+  Qapply = intern ("apply");
+  staticpro (&Qapply);
+
   pending_boundary = Qnil;
   staticpro (&pending_boundary);
 
@@ -627,17 +654,19 @@ which includes both saved text and other data.  */);
   DEFVAR_LISP ("undo-outer-limit", &Vundo_outer_limit,
               doc: /* Outer limit on size of undo information for one command.
 At garbage collection time, if the current command has produced
-more than this much undo information, it asks you whether to delete
-the information.  This is a last-ditch limit to prevent memory overflow.
+more than this much undo information, it discards the info and displays
+a warning.  This is a last-ditch limit to prevent memory overflow.
 
-The size is counted as the number of bytes occupied,
-which includes both saved text and other data.
+The size is counted as the number of bytes occupied, which includes
+both saved text and other data.  A value of nil means no limit.  In
+this case, accumulating one huge undo entry could make Emacs crash as
+a result of memory overflow.
 
 In fact, this calls the function which is the value of
 `undo-outer-limit-function' with one argument, the size.
 The text above describes the behavior of the function
 that variable usually specifies.  */);
-  Vundo_outer_limit = make_number (300000);
+  Vundo_outer_limit = make_number (3000000);
 
   DEFVAR_LISP ("undo-outer-limit-function", &Vundo_outer_limit_function,
                doc: /* Function to call when an undo list exceeds `undo-outer-limit'.
diff --git a/src/xdisp.c b/src/xdisp.c
index 7d7e510892b..31a6074b61f 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -4799,6 +4799,7 @@ back_to_previous_visible_line_start (it)
         int beg, end;
         Lisp_Object val, overlay;
 
+        it2.sp = 0;
         if (handle_display_prop (&it2) == HANDLED_RETURN
             && !NILP (val = get_char_property_and_overlay
                       (make_number (pos), Qdisplay, Qnil, &overlay))
diff --git a/src/xfns.c b/src/xfns.c
index f8829562174..2bb5fa31327 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -4323,11 +4323,15 @@ show_hourglass (timer)
                     {
                       unsigned long mask = CWCursor;
                       XSetWindowAttributes attrs;
-
+#ifdef USE_GTK
+                      Window parent = FRAME_X_WINDOW (f);
+#else
+                      Window parent = FRAME_OUTER_WINDOW (f);
+#endif
                       attrs.cursor = f->output_data.x->hourglass_cursor;
 
                       f->output_data.x->hourglass_window
-                        = XCreateWindow (dpy, FRAME_OUTER_WINDOW (f),
+                        = XCreateWindow (dpy, parent,
                                          0, 0, 32000, 32000, 0, 0,
                                          InputOnly,
                                          CopyFromParent,