(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 ae4bc3f44da4d22b299244a2c4231b4cc3553a08..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\
@@ -1092,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.  */
@@ -1181,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
@@ -1368,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 ();