(make_cursor_line_fully_visible): Handle case of rows

[gnu-emacs] / src / emacs.c

diff --git a/src/emacs.c b/src/emacs.c
index dd2e4b10f3f1d6d66264cc892cace2672c8a55f2..ddb540eb3d10798b96642141de565e026d7e6bf3 100644 (file)
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -255,6 +255,7 @@ Display options:\n\
 --iconic                       start Emacs in iconified state\n\
 --icon-type, -i                        use picture of gnu for Emacs icon\n\
 --internal-border, -ib WIDTH   width between text and main border\n\
+--line-spacing, -lsp PIXELS    additional space to put between lines\n\
 --mouse-color, -ms COLOR       mouse cursor color in Emacs window\n\
 --name NAME                    title of main Emacs window\n\
 --reverse-video, -r, -rv       switch foreground and background\n\
@@ -694,6 +695,9 @@ main (argc, argv, envp)
      char **argv;
      char **envp;
 {
+#if GC_MARK_STACK
+  Lisp_Object dummy;
+#endif
   char stack_bottom_variable;
   int do_initial_setlocale;
   int skip_args = 0;
@@ -704,6 +708,11 @@ main (argc, argv, envp)
 #endif
   int no_loadup = 0;
 
+#if GC_MARK_STACK
+  extern Lisp_Object *stack_base;
+  stack_base = &dummy;
+#endif
+
 #ifdef LINUX_SBRK_BUG
   __sbrk (1);
 #endif
@@ -1084,9 +1093,7 @@ main (argc, argv, envp)
         function creates Vterminal_frame.  Termcap frames now use
         faces, and the face implementation uses some symbols as
         face names.  */
-#ifndef HAVE_NTGUI
       syms_of_xfaces ();
-#endif
 
       init_window_once ();     /* Init the window system */
       init_fileio_once ();     /* Must precede any path manipulation.  */
@@ -1173,7 +1180,7 @@ main (argc, argv, envp)
     }
 
   no_loadup
-    = !argmatch (argv, argc, "-nl", "--no-loadup", 6, NULL, &skip_args);
+    = argmatch (argv, argc, "-nl", "--no-loadup", 6, NULL, &skip_args);
 
 
 #ifdef HAVE_X_WINDOWS
@@ -1360,7 +1367,6 @@ main (argc, argv, envp)
 #ifdef HAVE_NTGUI
       syms_of_w32term ();
       syms_of_w32fns ();
-      syms_of_w32faces ();
       syms_of_w32select ();
       syms_of_w32menu ();
       syms_of_fontset ();
@@ -1404,9 +1410,7 @@ main (argc, argv, envp)
   init_xdisp ();
   init_macros ();
   init_editfns ();
-#ifdef LISP_FLOAT_TYPE
   init_floatfns ();
-#endif
 #ifdef VMS
   init_vmsfns ();
 #endif /* VMS */
@@ -1463,7 +1467,6 @@ main (argc, argv, envp)
       extern void dump_opcode_frequencies ();
 
       atexit (_mcleanup);
-      // atexit (dump_opcode_frequencies);
       /* This uses safe_bcopy because that function comes first in the
         Emacs executable.  It might be better to use something that
         gives the start of the text segment, but start_of_text is not