xemacs-beta: src/event-stream.c comparison

comparison src/event-stream.c @ 430:a5df635868b2 r21-2-23

Import from CVS: tag r21-2-23

author	cvs
date	Mon, 13 Aug 2007 11:29:08 +0200
parents	3ecd8885ac67
children	9d177e8d4150

comparison

equal deleted inserted replaced

-:8305706cbb93
+:a5df635868b2
 Lisp_Object Qmenu_down;
 Lisp_Object Qmenu_left;
 Lisp_Object Qmenu_right;
 Lisp_Object Qmenu_select;
 Lisp_Object Qmenu_escape;
+Lisp_Object Qself_insert_defer_undo;
 /* this is in keymap.c */
 extern Lisp_Object Fmake_keymap (Lisp_Object name);
 #ifdef DEBUG_XEMACS
 #if defined(HAVE_X_WINDOWS) && defined(LWLIB_MENUBARS_LUCID)
 static void
 menu_move_up (void)
 {
-widget_value *current, *prev;
+widget_value *current = lw_get_entries (False);
-widget_value *entries;
+widget_value *entries = lw_get_entries (True);
+widget_value *prev    = NULL;
-current = lw_get_entries (False);
-entries = lw_get_entries (True);
+while (entries != current)
-prev = NULL;
+{
-if (current != entries)
+if (entries->name /*&& entries->enabled*/) prev = entries;
-{
+entries = entries->next;
-while (entries != current)
+assert (entries);
-	{
-	  if (entries->name /*&& entries->enabled*/) prev = entries;
-	  entries = entries->next;
-	  assert (entries);
-	}
 }
 if (!prev)
 /* move to last item */
 {
 }
 static void
 menu_move_down (void)
 {
-widget_value *current;
+widget_value *current = lw_get_entries (False);
-widget_value *new;
+widget_value *new = current;
-current = lw_get_entries (False);
-new = current;
 while (new->next)
 {
 new = new->next;
 if (new->name /*&& new->enabled*/) break;
 {
 int level = lw_menu_level ();
 int l = level;
 widget_value *current;
-while (level >= 3)
+while (level-- >= 3)
-{
+lw_pop_menu ();
---level;
-lw_pop_menu ();
-}
 menu_move_up ();
 current = lw_get_entries (False);
 if (l > 2 && current->contents)
 lw_push_menu (current->contents);
 }
 {
 int level = lw_menu_level ();
 int l = level;
 widget_value *current;
-while (level >= 3)
+while (level-- >= 3)
-{
+lw_pop_menu ();
---level;
-lw_pop_menu ();
-}
 menu_move_down ();
 current = lw_get_entries (False);
 if (l > 2 && current->contents)
 lw_push_menu (current->contents);
 }
 	    /* Reset the command builder for reading the next sequence. */
 	    reset_this_command_keys (console, 1);
 	  }
 	else /* key sequence is bound to a command */
 	  {
+	    int magic_undo = 0;
+	    int magic_undo_count = 20;
 	    Vthis_command = leaf;
 	    /* Don't push an undo boundary if the command set the prefix arg,
 	       or if we are executing a keyboard macro, or if in the
 	       minibuffer.  If the command we are about to execute is
 	       self-insert, it's tricky: up to 20 consecutive self-inserts may
 	       be done without an undo boundary.  This counter is reset as
 	       soon as a command other than self-insert-command is executed.
-	       */
-	    if (! EQ (leaf, Qself_insert_command))
+	       Programmers can also use the `self-insert-undo-magic'
+	       property to install that behaviour on functions other
+	       than `self-insert-command', or to change the magic
+	       number 20 to something else.  */
+	    if (SYMBOLP (leaf))
+	      {
+		Lisp_Object prop = Fget (leaf, Qself_insert_defer_undo, Qnil);
+		if (NATNUMP (prop))
+		  magic_undo = 1, magic_undo_count = XINT (prop);
+		else if (!NILP (prop))
+		  magic_undo = 1;
+		else if (EQ (leaf, Qself_insert_command))
+		  magic_undo = 1;
+	      }
+	    if (!magic_undo)
 	      command_builder->self_insert_countdown = 0;
 	    if (NILP (XCONSOLE (console)->prefix_arg)
 		&& NILP (Vexecuting_macro)
 #if 0
 		/* This was done in the days when there was no undo
 		&& !EQ (minibuf_window, Fselected_window (Qnil))
 #endif
 		&& command_builder->self_insert_countdown == 0)
 	      Fundo_boundary ();
-	    if (EQ (leaf, Qself_insert_command))
+	    if (magic_undo)
 	      {
 		if (--command_builder->self_insert_countdown < 0)
-		  command_builder->self_insert_countdown = 20;
+		  command_builder->self_insert_countdown = magic_undo_count;
 	      }
 	    execute_command_event
 (command_builder,
 	       internal_equal (event, command_builder-> most_current_event, 0)
 ? event
 the value of `this-command-keys' in addition to the raw original event.
 That is not right.
 Calling this function directs the translated event to replace
 the original event, so that only one version of the event actually
-appears in the echo area and in the value of `this-command-keys.'.
+appears in the echo area and in the value of `this-command-keys'.
 */
 ())
 {
 /* #### I don't understand this at all, so currently it does nothing.
 If there is ever a problem, maybe someone should investigate. */
 defsymbol (&Qmenu_left, "menu-left");
 defsymbol (&Qmenu_right, "menu-right");
 defsymbol (&Qmenu_select, "menu-select");
 defsymbol (&Qmenu_escape, "menu-escape");
+defsymbol (&Qself_insert_defer_undo, "self-insert-defer-undo");
 defsymbol (&Qcancel_mode_internal, "cancel-mode-internal");
 }
 void
 reinit_vars_of_event_stream (void)

Mercurial > hg > xemacs-beta

comparison src/event-stream.c @ 430:a5df635868b2 r21-2-23