Mercurial > hg > xemacs-beta

diff src/frame.c @ 771:943eaba38521

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2002-03-13 08:51:24 by ben] The big ben-mule-21-5 check-in! Various files were added and deleted. See CHANGES-ben-mule. There are still some test suite failures. No crashes, though. Many of the failures have to do with problems in the test suite itself rather than in the actual code. I'll be addressing these in the next day or so -- none of the test suite failures are at all critical. Meanwhile I'll be trying to address the biggest issues -- i.e. build or run failures, which will almost certainly happen on various platforms. All comments should be sent to ben@xemacs.org -- use a Cc: if necessary when sending to mailing lists. There will be pre- and post- tags, something like pre-ben-mule-21-5-merge-in, and post-ben-mule-21-5-merge-in.
author ben
date Wed, 13 Mar 2002 08:54:06 +0000
parents fdefd0186b75
children e38acbeb1cae
line wrap: on
line diff
--- a/src/frame.c	Fri Mar 08 13:33:14 2002 +0000
+++ b/src/frame.c	Wed Mar 13 08:54:06 2002 +0000
@@ -1,6 +1,6 @@
 /* Generic frame functions.
    Copyright (C) 1989, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
-   Copyright (C) 1995, 1996 Ben Wing.
+   Copyright (C) 1995, 1996, 2002 Ben Wing.
    Copyright (C) 1995 Sun Microsystems, Inc.
 
 This file is part of XEmacs.
@@ -377,6 +377,7 @@
   int first_frame_on_device = 0;
   int first_frame_on_console = 0;
   Lisp_Object besmirched_cons = Qnil;
+  int frame_name_is_defaulted = 1;
 
   d = decode_device (device);
   XSETDEVICE (device, d);
@@ -396,7 +397,10 @@
 
   name = Flax_plist_get (props, Qname, Qnil);
   if (!NILP (name))
-    CHECK_STRING (name);
+    {
+      CHECK_STRING (name);
+      frame_name_is_defaulted = 0;
+    }
   else if (STRINGP (Vdefault_frame_name))
     name = Vdefault_frame_name;
   else
@@ -412,7 +416,7 @@
   specbind (Qframe_being_created, name);
   f->name = name;
 
-  FRAMEMETH (f, init_frame_1, (f, props));
+  FRAMEMETH (f, init_frame_1, (f, props, frame_name_is_defaulted));
 
   minibuf = Flax_plist_get (props, Qminibuffer, Qunbound);
   if (UNBOUNDP (minibuf))
@@ -509,7 +513,7 @@
 
   XCDR (besmirched_cons) = Qunbound;
 
-  unbind_to (speccount2, Qnil);
+  unbind_to (speccount2);
 
   /* If this is the first frame on the device, make it the selected one. */
   if (first_frame_on_device && NILP (DEVICE_SELECTED_FRAME (d)))
@@ -557,7 +561,7 @@
   if (!UNBOUNDP (symbol_function (XSYMBOL (Qcustom_initialize_frame))))
     call1 (Qcustom_initialize_frame, frame);
 
-  unbind_to (speccount, Qnil);
+  unbind_to (speccount);
 
   UNGCPRO;
   return frame;
@@ -596,14 +600,6 @@
   return decode_frame (cdf);
 }
 
-Lisp_Object
-make_frame (struct frame *f)
-{
-  Lisp_Object frame;
-  XSETFRAME (frame, f);
-  return frame;
-}
-
 
 /*
  * window size changes are held up during critical regions.  Afterwards,