From: Gerd Moellmann <gerd@gnu.org>
Date: Thu, 5 Apr 2001 13:08:48 +0000 (+0000)
Subject: (x_free_frame_resources) [USE_X_TOOLKIT]: Set
X-Git-Tag: emacs-pretest-21.0.102~29
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=30ca89f529cd78252144ebf32409813d529aa693;p=emacs.git

(x_free_frame_resources) [USE_X_TOOLKIT]: Set
f->output_data.x->widget to null after destroying it.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 27f1a7f7108..11a53dbe1c0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,14 @@
 2001-04-05  Gerd Moellmann  <gerd@gnu.org>
 
+	* xfns.c (Vmotif_version_string) [USE_MOTIF]: New variable.
+	(syms_of_xfns): DEFVAR_LISP it.  Initialize from XmVERSION_STRING.
+
+	* xmenu.c (free_frame_menubar) [USE_MOTIF]: Preserve the
+	shell widget's position only if it is non-null.
+
+	* xterm.c (x_free_frame_resources) [USE_X_TOOLKIT]: Set 
+	f->output_data.x->widget to null after destroying it.
+
 	* fns.c (Frequire): Doc fix.  Rename parameter FILE_NAME to
 	FILENAME to bring it in synch with the documentation.
 
diff --git a/src/xterm.c b/src/xterm.c
index f4cce32b5fa..15ba1e9c6dc 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -12821,7 +12821,10 @@ x_free_frame_resources (f)
       
 #ifdef USE_X_TOOLKIT
       if (f->output_data.x->widget)
-	XtDestroyWidget (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 */