[Emacs-diffs] /srv/bzr/emacs/trunk r103668: src/emacs.c (USAGE3): Doc fixes.

[Juanma Barranquero]

------------------------------------------------------------
revno: 103668
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Wed 2011-03-16 01:53:19 +0100
message:
  src/emacs.c (USAGE3): Doc fixes.
modified:
  src/ChangeLog
  src/emacs.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-03-15 18:38:57 +0000
+++ b/src/ChangeLog     2011-03-16 00:53:19 +0000
@@ -1,3 +1,7 @@
+2011-03-16  Juanma Barranquero  <address@hidden>
+
+       * emacs.c (USAGE3): Doc fixes.
+
 2011-03-15  Andreas Schwab  <address@hidden>
 
        * coding.c (detect_coding_iso_2022): Reorganize code to clarify

=== modified file 'src/emacs.c'
--- a/src/emacs.c       2011-02-06 01:25:41 +0000
+++ b/src/emacs.c       2011-03-16 00:53:19 +0000
@@ -141,7 +141,7 @@
 
 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 @@
 #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 @@
 --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 @@
    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;