[Emacs-diffs] Changes to emacs/src/keyboard.c

[Stefan Monnier]

Index: emacs/src/keyboard.c
diff -c emacs/src/keyboard.c:1.732 emacs/src/keyboard.c:1.733
*** emacs/src/keyboard.c:1.732  Mon Mar 24 14:59:08 2003
--- emacs/src/keyboard.c        Fri Apr 11 19:19:50 2003
***************
*** 4002,4015 ****
          internal_last_event_frame = frame;
          kbd_fetch_ptr = event + 1;
        }
-       else if (event->kind == SELECT_WINDOW_EVENT)
-       {
-         /* Make an event (select-window (WINDOW)).  */
-         obj = Fcons (event->frame_or_window, Qnil);
-         obj = Fcons (Qselect_window, Fcons (obj, Qnil));
- 
-         kbd_fetch_ptr = event + 1;
-       }
        else
        {
          /* If this event is on a different frame, return a switch-frame this
--- 4002,4007 ----
***************
*** 5658,5663 ****
--- 5650,5661 ----
        return event->arg;
  #endif
  
+     case SELECT_WINDOW_EVENT:
+       /* Make an event (select-window (WINDOW)).  */
+       return Fcons (Qselect_window,
+                   Fcons (Fcons (event->frame_or_window, Qnil),
+                          Qnil));
+ 
      case TOOL_BAR_EVENT:
        if (EQ (event->arg, event->frame_or_window))
        /* This is the prefix key.  We translate this to
***************
*** 11276,11283 ****
                            "ignore-event");
    initial_define_lispy_key (Vspecial_event_map, "make-frame-visible",
                            "ignore-event");
!   initial_define_lispy_key (Vspecial_event_map, "select-window",
!                           "handle-select-window");
    initial_define_lispy_key (Vspecial_event_map, "save-session",
                            "handle-save-session");
  }
--- 11274,11285 ----
                            "ignore-event");
    initial_define_lispy_key (Vspecial_event_map, "make-frame-visible",
                            "ignore-event");
!   /* Handling it at such a low-level causes read_key_sequence to get
!    * confused because it doesn't realize that the current_buffer was
!    * changed by read_char.
!    * 
!    * initial_define_lispy_key (Vspecial_event_map, "select-window",
!    *                      "handle-select-window"); */
    initial_define_lispy_key (Vspecial_event_map, "save-session",
                            "handle-save-session");
  }