Merge from emacs--devo--0

[gnu-emacs] / src / widget.c

diff --git a/src/widget.c b/src/widget.c
index eaf8e66e9a94e6446f75c291e44985392e8a3ce6..35bf5631b2042e1c67667c5dd51661c4daecbf81 100644 (file)
--- a/src/widget.c
+++ b/src/widget.c
@@ -1,5 +1,6 @@
 /* The emacs frame widget.
-   Copyright (C) 1992, 1993, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1992, 1993, 2000, 2002, 2003, 2004,
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -15,8 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Emacs 19 face widget ported by Fred Pierresteguy */
 
@@ -758,7 +759,6 @@ EmacsFrameDestroy (widget)
 
   if (! s) abort ();
   if (! s->output_data.x) abort ();
-  if (! s->output_data.x->normal_gc) abort ();
 
   BLOCK_INPUT;
   x_free_gcs (s);
@@ -1016,3 +1016,6 @@ widget_store_internal_border (widget)
 
   ew->emacs_frame.internal_border_width = f->internal_border_width;
 }
+
+/* arch-tag: 931d28e5-0d59-405a-8325-7d475d0a13d9
+   (do not change this comment) */