[Emacs-diffs] Changes to emacs/src/term.c,v

[Jason Rumney]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Jason Rumney <jasonr>   07/09/04 22:31:01

Index: term.c
===================================================================
RCS file: /sources/emacs/emacs/src/term.c,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -b -r1.193 -r1.194
--- term.c      4 Sep 2007 15:44:08 -0000       1.193
+++ term.c      4 Sep 2007 22:31:01 -0000       1.194
@@ -3272,7 +3272,7 @@
 #endif
 
 #ifdef WINDOWSNT
-  initialize_w32_display ();
+  initialize_w32_display (terminal);
 
   /* XXX Can this be non-null?  */
   if (name)
@@ -3315,7 +3315,6 @@
 
   tty->TN_max_colors = 16;  /* Required to be non-zero for tty-display-color-p 
*/
 
-  return terminal;
 #else  /* not WINDOWSNT */
 
   Wcm_clear (tty);
@@ -3483,6 +3482,7 @@
   tty->TF_underscore = tgetflag ("ul");
   tty->TF_teleray = tgetflag ("xt");
 
+#endif /* !WINDOWSNT  */
 #ifdef MULTI_KBOARD
   terminal->kboard = (KBOARD *) xmalloc (sizeof (KBOARD));
   init_kboard (terminal->kboard);
@@ -3494,9 +3494,12 @@
      prompt in the mini-buffer.  */
   if (current_kboard == initial_kboard)
     current_kboard = terminal->kboard;
+#ifndef WINDOWSNT
   term_get_fkeys (address, terminal->kboard);
 #endif
+#endif
 
+#ifndef WINDOWSNT
   /* Get frame size from system, or else from termcap.  */
   {
     int height, width;
@@ -3718,9 +3721,9 @@
 
   /* Init system terminal modes (RAW or CBREAK, etc.).  */
   init_sys_modes (tty);
+#endif /* not WINDOWSNT */
 
   return terminal;
-#endif /* not WINDOWSNT */
 }
 
 /* Auxiliary error-handling function for init_tty.