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

[Juri Linkov]

Index: emacs/src/emacs.c
diff -c emacs/src/emacs.c:1.359 emacs/src/emacs.c:1.360
*** emacs/src/emacs.c:1.359     Fri Mar  4 11:06:42 2005
--- emacs/src/emacs.c   Sat Mar  5 04:34:59 2005
***************
*** 250,256 ****
  display editor.  The recommended way to start Emacs for normal editing\n\
  is with no options at all.\n\
  \n\
! Run M-x info RET m emacs RET m command arguments RET inside Emacs to\n\
  read the main documentation for these command-line arguments.\n\
  \n\
  Initialization options:\n\
--- 250,256 ----
  display editor.  The recommended way to start Emacs for normal editing\n\
  is with no options at all.\n\
  \n\
! Run M-x info RET m emacs RET m emacs invocation RET inside Emacs to\n\
  read the main documentation for these command-line arguments.\n\
  \n\
  Initialization options:\n\
***************
*** 296,302 ****
  --background-color, -bg COLOR   window background color\n\
  --border-color, -bd COLOR       main border color\n\
  --border-width, -bw WIDTH       width of main border\n\
! --color MODE                    color mode for character terminals;\n\
                                    MODE defaults to `auto', and can also\n\
                                    be `never', `auto', `always',\n\
                                    or a mode name like `ansi8'\n\
--- 296,302 ----
  --background-color, -bg COLOR   window background color\n\
  --border-color, -bd COLOR       main border color\n\
  --border-width, -bw WIDTH       width of main border\n\
! --color, --color=MODE           color mode for character terminals;\n\
                                    MODE defaults to `auto', and can also\n\
                                    be `never', `auto', `always',\n\
                                    or a mode name like `ansi8'\n\
***************
*** 313,318 ****
--- 313,319 ----
  --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 for initial Emacs frame\n\
+ --no-blinking-cursor, -nbc      disable blinking cursor\n\
  --reverse-video, -r, -rv        switch foreground and background\n\
  --title, -T TITLE               title for initial Emacs frame\n\
  --vertical-scroll-bars, -vb     enable vertical scroll bars\n\
***************
*** 1824,1829 ****
--- 1825,1831 ----
    { "-ib", "--internal-border", 10, 1 },
    { "-ms", "--mouse-color", 10, 1 },
    { "-cr", "--cursor-color", 10, 1 },
+   { "-nbc", "--no-blinking-cursor", 10, 0 },
    { "-fn", "--font", 10, 1 },
    { "-font", 0, 10, 1 },
    { "-fs", "--fullscreen", 10, 0 },