From: Juanma Barranquero <lekktu@gmail.com>
Date: Wed, 16 Mar 2011 00:53:19 +0000 (+0100)
Subject: src/emacs.c (USAGE3): Doc fixes.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~565
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=62973b416261f9b43e9026807651554e3cf2c9c3;p=emacs.git

src/emacs.c (USAGE3): Doc fixes.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 72585209c24..44e4494d79a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2011-03-16  Juanma Barranquero  <lekktu@gmail.com>
+
+	* emacs.c (USAGE3): Doc fixes.
+
 2011-03-15  Andreas Schwab  <schwab@linux-m68k.org>
 
 	* coding.c (detect_coding_iso_2022): Reorganize code to clarify
diff --git a/src/emacs.c b/src/emacs.c
index 4455e6b4d9f..84092e18b8b 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -141,7 +141,7 @@ Lisp_Object Qfile_name_handler_alist;
 
 Lisp_Object Qrisky_local_variable;
 
-/* If non-zero, emacs should not attempt to use a window-specific code,
+/* If non-zero, Emacs should not attempt to use a window-specific code,
    but instead should use the virtual terminal under which it was started.  */
 int inhibit_window_system;
 
@@ -169,7 +169,6 @@ static unsigned long heap_bss_diff;
 #define MAX_HEAP_BSS_DIFF (1024*1024)
 
 /* Nonzero means running Emacs without interactive terminal.  */
-
 int noninteractive;
 
 /* Nonzero means remove site-lisp directories from load-path.  */
@@ -249,14 +248,14 @@ Display options:\n\
 --border-color, -bd COLOR       main border color\n\
 --border-width, -bw WIDTH       width of main border\n\
 --color, --color=MODE           override color mode for character terminals;\n\
-                                  MODE defaults to `auto', and can also\n\
-                                  be `never', `auto', `always',\n\
+                                  MODE defaults to `auto', and\n\
+                                  can also be `never', `always',\n\
                                   or a mode name like `ansi8'\n\
 --cursor-color, -cr COLOR       color of the Emacs cursor indicating point\n\
 --font, -fn FONT                default font; must be fixed-width\n\
 --foreground-color, -fg COLOR   window foreground color\n\
 --fullheight, -fh               make the first frame high as the screen\n\
---fullscreen, -fs               make first frame fullscreen\n\
+--fullscreen, -fs               make the first frame fullscreen\n\
 --fullwidth, -fw                make the first frame wide as the screen\n\
 --maximized, -mm                make the first frame maximized\n\
 --geometry, -g GEOMETRY         window geometry\n\
@@ -576,7 +575,8 @@ void __main (void)
    enough information to do it right.  */
 
 static int
-argmatch (char **argv, int argc, const char *sstr, const char *lstr, int minlen, char **valptr, int *skipptr)
+argmatch (char **argv, int argc, const char *sstr, const char *lstr,
+          int minlen, char **valptr, int *skipptr)
 {
   char *p = NULL;
   int arglen;