[Emacs-diffs] Changes to emacs/man/cmdargs.texi

[Richard M . Stallman]

Index: emacs/man/cmdargs.texi
diff -c emacs/man/cmdargs.texi:1.84 emacs/man/cmdargs.texi:1.85
*** emacs/man/cmdargs.texi:1.84 Sat Feb  5 13:44:46 2005
--- emacs/man/cmdargs.texi      Sun Feb  6 11:11:51 2005
***************
*** 14,28 ****
  for sophisticated activities.  We don't recommend using them for
  ordinary editing.
  
!   Arguments starting with @samp{-} are @dfn{options}.  Other arguments
! specify files to visit.  Emacs visits the specified files while it
! starts up.  The last file name on your command line becomes the
! current buffer; the other files are also visited in other buffers.  If
! there are two files, they are both displayed; otherwise the last file
! is displayed along with a buffer list that shows what other buffers
! there are.  As with most programs, the special argument @samp{--} says
! that all subsequent arguments are file names, not options, even if
! they start with @samp{-}.
  
    Emacs command options can specify many things, such as the size and
  position of the X window Emacs uses, its colors, and so on.  A few
--- 14,29 ----
  for sophisticated activities.  We don't recommend using them for
  ordinary editing.
  
!   Arguments starting with @samp{-} are @dfn{options}, and so is
! @address@hidden  All other arguments specify files to visit.
! Emacs visits the specified files while it starts up.  The last file
! name on your command line becomes the current buffer; the other files
! are also visited in other buffers.  If there are two files, they are
! both displayed; otherwise the last file is displayed along with a
! buffer list that shows what other buffers there are.  As with most
! programs, the special argument @samp{--} says that all subsequent
! arguments are file names, not options, even if they start with
! @samp{-}.
  
    Emacs command options can specify many things, such as the size and
  position of the X window Emacs uses, its colors, and so on.  A few
***************
*** 111,119 ****
  @opindex --load
  @cindex loading Lisp libraries, command-line argument
  Load a Lisp library named @var{file} with the function @code{load}.
! @xref{Lisp Libraries}.  The library can be found either in the current
! directory, or in the Emacs library search path as specified
! with @env{EMACSLOADPATH} (@pxref{General Variables}).
  
  @item -L @var{dir}
  @opindex -L
--- 112,121 ----
  @opindex --load
  @cindex loading Lisp libraries, command-line argument
  Load a Lisp library named @var{file} with the function @code{load}.
! @xref{Lisp Libraries}.  If @var{file} is not an absolute file name,
! the library can be found either in the current directory, or in the
! Emacs library search path as specified with @env{EMACSLOADPATH}
! (@pxref{General Variables}).
  
  @item -L @var{dir}
  @opindex -L
***************
*** 218,227 ****
  @code{stderr}.  Functions that would normally read from the minibuffer
  take their input from @code{stdin} instead.
  
! @samp{--batch} implies @samp{-q} (do not load an init file).  It also
! causes Emacs to exit after processing all the command options.  In
! addition, it disables auto-saving except in buffers for which it has
! been explicitly requested.
  
  @item --script @var{file}
  @opindex --script
--- 220,230 ----
  @code{stderr}.  Functions that would normally read from the minibuffer
  take their input from @code{stdin} instead.
  
! @samp{--batch} implies @samp{-q} (do not load an init file), but
! @file{site-start.el} is loaded nonetheless.  It also causes Emacs to
! exit after processing all the command options.  In addition, it
! disables auto-saving except in buffers for which it has been
! explicitly requested.
  
  @item --script @var{file}
  @opindex --script
***************
*** 301,307 ****
  explicitly ask for a multibyte buffer or string.  (Note that Emacs
  always loads Lisp files in multibyte mode, even if @samp{--unibyte} is
  specified; see @ref{Enabling Multibyte}.)  Setting the environment
! variable @env{EMACS_UNIBYTE} has the same effect.
  
  @item --multibyte
  @opindex --multibyte
--- 304,311 ----
  explicitly ask for a multibyte buffer or string.  (Note that Emacs
  always loads Lisp files in multibyte mode, even if @samp{--unibyte} is
  specified; see @ref{Enabling Multibyte}.)  Setting the environment
! variable @env{EMACS_UNIBYTE} has the same effect
! (@pxref{General Variables}).
  
  @item --multibyte
  @opindex --multibyte
***************
*** 320,326 ****
  to be a C program.
  
  @example
! emacs -batch foo.c -l hack-c -f save-buffer >& log
  @end example
  
  @noindent
--- 324,330 ----
  to be a C program.
  
  @example
! emacs --batch foo.c -l hack-c -f save-buffer >& log
  @end example
  
  @noindent