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

[Miles Bader]

Index: emacs/src/callint.c
diff -c emacs/src/callint.c:1.115.2.6 emacs/src/callint.c:1.115.2.7
*** emacs/src/callint.c:1.115.2.6       Fri Oct 29 02:05:11 2004
--- emacs/src/callint.c Fri Nov 12 04:21:17 2004
***************
*** 265,271 ****
    Lisp_Object *args, *visargs;
    unsigned char **argstrings;
    Lisp_Object fun;
-   Lisp_Object funcar;
    Lisp_Object specs;
    Lisp_Object filter_specs;
    Lisp_Object teml;
--- 265,270 ----
***************
*** 451,475 ****
        string++;
        else if (*string == '@')
        {
!         Lisp_Object event;
  
          event = (next_event < key_count
                   ? XVECTOR (keys)->contents[next_event]
                   : Qnil);
          if (EVENT_HAS_PARAMETERS (event)
!             && (event = XCDR (event), CONSP (event))
!             && (event = XCAR (event), CONSP (event))
!             && (event = XCAR (event), WINDOWP (event)))
            {
!             if (MINI_WINDOW_P (XWINDOW (event))
!                 && ! (minibuf_level > 0 && EQ (event, minibuf_window)))
                error ("Attempt to select inactive minibuffer window");
  
              /* If the current buffer wants to clean up, let it.  */
              if (!NILP (Vmouse_leave_buffer_hook))
                call1 (Vrun_hooks, Qmouse_leave_buffer_hook);
  
!             Fselect_window (event, Qnil);
            }
          string++;
        }
--- 450,474 ----
        string++;
        else if (*string == '@')
        {
!         Lisp_Object event, tem;
  
          event = (next_event < key_count
                   ? XVECTOR (keys)->contents[next_event]
                   : Qnil);
          if (EVENT_HAS_PARAMETERS (event)
!             && (tem = XCDR (event), CONSP (tem))
!             && (tem = XCAR (tem), CONSP (tem))
!             && (tem = XCAR (tem), WINDOWP (tem)))
            {
!             if (MINI_WINDOW_P (XWINDOW (tem))
!                 && ! (minibuf_level > 0 && EQ (tem, minibuf_window)))
                error ("Attempt to select inactive minibuffer window");
  
              /* If the current buffer wants to clean up, let it.  */
              if (!NILP (Vmouse_leave_buffer_hook))
                call1 (Vrun_hooks, Qmouse_leave_buffer_hook);
  
!             Fselect_window (tem, Qnil);
            }
          string++;
        }