emacs-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Patch for 21.0.101, LessTif or Motif


From: Gerd Moellmann
Subject: Patch for 21.0.101, LessTif or Motif
Date: 05 Apr 2001 15:15:12 +0200
User-agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.0.102

If you are using LessTif or Motif, please apply this patch to 
21.0.101.  This fixes a SEGV after C-x 5 2 C-x 5 0.

*** xmenu.c     2001/03/27 14:53:52     1.212
--- xmenu.c     2001/04/05 12:58:29
***************
*** 1885,1900 ****
        BLOCK_INPUT;
  
  #ifdef USE_MOTIF
!       XtVaGetValues (f->output_data.x->widget, XtNx, &x0, XtNy, &y0, NULL);
  #endif
        
        lw_destroy_all_widgets ((LWLIB_ID) f->output_data.x->id);
        f->output_data.x->menubar_widget = NULL;
  
  #ifdef USE_MOTIF
!       XtVaGetValues (f->output_data.x->widget, XtNx, &x1, XtNy, &y1, NULL);
!       if (x1 == 0 && y1 == 0)
!       XtVaSetValues (f->output_data.x->widget, XtNx, x0, XtNy, y0, NULL);
  #endif
        
        UNBLOCK_INPUT;
--- 1885,1904 ----
        BLOCK_INPUT;
  
  #ifdef USE_MOTIF
!       if (f->output_data.x->widget)
!       XtVaGetValues (f->output_data.x->widget, XtNx, &x0, XtNy, &y0, NULL);
  #endif
        
        lw_destroy_all_widgets ((LWLIB_ID) f->output_data.x->id);
        f->output_data.x->menubar_widget = NULL;
  
  #ifdef USE_MOTIF
!       if (f->output_data.x->widget)
!       {
!         XtVaGetValues (f->output_data.x->widget, XtNx, &x1, XtNy, &y1, NULL);
!         if (x1 == 0 && y1 == 0)
!           XtVaSetValues (f->output_data.x->widget, XtNx, x0, XtNy, y0, NULL);
!       }
  #endif
        
        UNBLOCK_INPUT;
*** xterm.c     2001/04/05 12:46:01     1.621
--- xterm.c     2001/04/05 12:58:01
***************
*** 12821,12827 ****
        
  #ifdef USE_X_TOOLKIT
        if (f->output_data.x->widget)
!       XtDestroyWidget (f->output_data.x->widget);
        free_frame_menubar (f);
  #endif /* USE_X_TOOLKIT */
  
--- 12821,12830 ----
        
  #ifdef USE_X_TOOLKIT
        if (f->output_data.x->widget)
!       {
!         XtDestroyWidget (f->output_data.x->widget);
!         f->output_data.x->widget = NULL;
!       }
        free_frame_menubar (f);
  #endif /* USE_X_TOOLKIT */
  



reply via email to

[Prev in Thread] Current Thread [Next in Thread]