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

[Miles Bader]

Index: emacs/man/cmdargs.texi
diff -c emacs/man/cmdargs.texi:1.63.2.1 emacs/man/cmdargs.texi:1.63.2.2
*** emacs/man/cmdargs.texi:1.63.2.1     Fri Apr  4 01:20:47 2003
--- emacs/man/cmdargs.texi      Tue Oct 14 18:56:22 2003
***************
*** 112,118 ****
  @itemx address@hidden
  @opindex --funcall
  @cindex call Lisp functions, command-line argument
! Call Lisp function @var{function} with no arguments.
  
  @item address@hidden
  @opindex --eval
--- 112,121 ----
  @itemx address@hidden
  @opindex --funcall
  @cindex call Lisp functions, command-line argument
! Call Lisp function @var{function}.  If it is an interactive function
! (a command), it reads the arguments interactively just as if you had
! called the same function with a key sequence.  Otherwise, it calls the
! function with no arguments.
  
  @item address@hidden
  @opindex --eval
***************
*** 469,477 ****
  The user's login name.  See also @env{USER}.
  @item MAIL
  The name of the user's system mail inbox.
- @item MAILRC
- Name of file containing mail aliases.  (The default is
- @file{~/.mailrc}.)
  @item MH
  Name of setup file for the mh system.  (The default is @file{~/.mh_profile}.)
  @item NAME
--- 472,477 ----
***************
*** 497,503 ****
  inside Emacs.
  @item SMTPSERVER
  The name of the outgoing mail server.  Used by the SMTP library
! (@pxref{Sending mail via SMTP,,,smtpmail}).
  @cindex background mode, on @command{xterm}
  @item TERM
  The type of the terminal that Emacs is using.  This variable must be
--- 497,503 ----
  inside Emacs.
  @item SMTPSERVER
  The name of the outgoing mail server.  Used by the SMTP library
! (@pxref{Top,,Sending mail via SMTP,smtpmail}).
  @cindex background mode, on @command{xterm}
  @item TERM
  The type of the terminal that Emacs is using.  This variable must be
***************
*** 691,701 ****
  @appendixsec Font Specification Options
  @cindex font name (X Window System)
  
!   By default, Emacs displays text in the font named @samp{9x15}, which
! makes each character nine pixels wide and fifteen pixels high.  You can
! specify a different font on your command line through the option
! @samp{-fn @var{name}} (or @samp{--font}, which is an alias for
! @samp{-fn}).
  
  @table @samp
  @item -fn @var{name}
--- 691,700 ----
  @appendixsec Font Specification Options
  @cindex font name (X Window System)
  
!   By default, Emacs displays text in a twelve point Courier font (when
! using X).  You can specify a different font on your command line
! through the option @samp{-fn @var{name}} (or @samp{--font}, which is
! an alias for @samp{-fn}).
  
  @table @samp
  @item -fn @var{name}
***************
*** 706,717 ****
  Use font @var{name} as the default font.
  @end table
  
!   Under X, each font has a long name which consists of eleven words or
! numbers, separated by dashes.  Some fonts also have shorter
! address@hidden is such a nickname.  You can use either kind of
! name.  You can use wildcard patterns for the font name; then Emacs lets
! X choose one of the fonts that match the pattern.  Here is an example,
! which happens to specify the font whose nickname is @samp{6x13}:
  
  @smallexample
  emacs -fn \
--- 705,723 ----
  Use font @var{name} as the default font.
  @end table
  
!   Under X, each font has a long name which consists of fourteen words
! or numbers, separated by dashes.  Some fonts also have shorter
! nicknames.  For instance, @samp{9x15} is such a nickname.  This font
! makes each character nine pixels wide and fifteen pixels high.  You
! can use either kind of name.  Case is insignificant in both kinds.
! You can use wildcard patterns for the font name; then Emacs lets X
! choose one of the fonts that match the pattern.  The wildcard
! character @samp{*} matches any sequence of characters (including none)
! and @samp{?} matches any single character.  However, matching is
! implementation-dependent, and can be inaccurate when wildcards match
! dashes in a long name.  For reliable results, supply all 14 dashes and
! use wildcards only within a field.  Here is an example, which happens
! to specify the font whose nickname is @samp{6x13}:
  
  @smallexample
  emacs -fn \
***************
*** 725,735 ****
  emacs.font: -misc-fixed-medium-r-semicondensed--13-*-*-*-c-60-iso8859-1
  @end smallexample
  
    A long font name has the following form:
  
  @smallexample
  address@hidden@address@hidden@address@hidden@address@hidden
! @address@hidden@address@hidden@address@hidden@address@hidden
  @end smallexample
  
  @table @var
--- 731,753 ----
  emacs.font: -misc-fixed-medium-r-semicondensed--13-*-*-*-c-60-iso8859-1
  @end smallexample
  
+   Note that if you use a wildcard pattern on the command line, you
+ need to enclose it in single or double quotes, to prevent the shell
+ from accidentally expanding it into a list of file names.  On the
+ other hand, you should not quote the name in the @file{.Xdefaults}
+ file.
+ 
+ The default font used by Emacs (under X) is:
+ 
+ @smallexample
+ -adobe-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-1
+ @end smallexample
+ 
    A long font name has the following form:
  
  @smallexample
  address@hidden@address@hidden@address@hidden@address@hidden
! @address@hidden@address@hidden@address@hidden@address@hidden@var{encoding}
  @end smallexample
  
  @table @var
***************
*** 770,778 ****
  (character cell).
  @item width
  This is the average character width, in pixels, multiplied by ten.
! @item charset
! This is the character set that the font depicts.
! Normally you should use @samp{iso8859-1}.
  @end table
  
  @cindex listing system fonts
--- 788,801 ----
  (character cell).
  @item width
  This is the average character width, in pixels, multiplied by ten.
! @item registry
! @itemx encoding
! These together make up the X font character set that the font depicts.
! (X font character sets are not the same as Emacs charsets, but they
! are solutions for the same problem.)  You can use the
! @command{xfontsel} program to check which choices you have.  However,
! normally you should use @samp{iso8859} for @var{registry} and @samp{1}
! for @var{encoding}.
  @end table
  
  @cindex listing system fonts
***************
*** 1114,1116 ****
--- 1137,1143 ----
  rather than showing a frame right away.  In this situation, the icon
  is the only indication that Emacs has started; the text frame doesn't
  appear until you deiconify it.
+ 
+ @ignore
+    arch-tag: fffecd9e-7329-4a51-a3cc-dd4a9889340e
+ @end ignore