[Emacs-diffs] /srv/bzr/emacs/emacs-23 r99658: Document font-use-system-font.

[Chong Yidong]

------------------------------------------------------------
revno: 99658
committer: Chong Yidong <address@hidden>
branch nick: emacs-23
timestamp: Sat 2010-03-20 13:24:06 -0400
message:
  Document font-use-system-font.
  
  * cmdargs.texi (Font X): Move most content to Fonts.
  
  * frames.texi (Fonts): New node.  Document font-use-system-font.
  
  * emacs.texi (Top):
  * xresources.texi (Table of Resources):
  * mule.texi (Defining Fontsets, Charsets): Update xrefs.
modified:
  doc/emacs/ChangeLog
  doc/emacs/cmdargs.texi
  doc/emacs/emacs.texi
  doc/emacs/frames.texi
  doc/emacs/mule.texi
  doc/emacs/xresources.texi
  etc/NEWS

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2010-03-06 19:02:49 +0000
+++ b/doc/emacs/ChangeLog       2010-03-20 17:24:06 +0000
@@ -1,3 +1,13 @@
+2010-03-20  Chong Yidong  <address@hidden>
+
+       * cmdargs.texi (Font X): Move most content to Fonts.
+
+       * frames.texi (Fonts): New node.  Document font-use-system-font.
+
+       * emacs.texi (Top):
+       * xresources.texi (Table of Resources):
+       * mule.texi (Defining Fontsets, Charsets): Update xrefs.
+
 2010-03-06  Chong Yidong  <address@hidden>
 
        * custom.texi (Init Examples): Add xref to Locals.

=== modified file 'doc/emacs/cmdargs.texi'
--- a/doc/emacs/cmdargs.texi    2010-01-13 08:35:10 +0000
+++ b/doc/emacs/cmdargs.texi    2010-03-20 17:24:06 +0000
@@ -755,10 +755,9 @@
 @appendixsec Font Specification Options
 @cindex font name (X Window System)
 
-  By default, Emacs displays text in X using a twelve point monospace
-font.  You can specify a different font using the command line option
address@hidden @var{font}} (or @samp{--font}, which is an alias for
address@hidden).
+You can use the command line option @samp{-fn @var{font}} (or
address@hidden, which is an alias for @samp{-fn}) to specify a default
+font:
 
 @table @samp
 @item -fn @var{font}
@@ -772,252 +771,14 @@
 When passing a font specification to Emacs on the command line, you
 may need to ``quote'' it, by enclosing it in quotation marks, if it
 contains characters that the shell treats specially (e.g. spaces).
-Here is an example:
+For example:
 
 @smallexample
 emacs -fn "DejaVu Sans Mono-12"
 @end smallexample
 
address@hidden X defaults file
address@hidden X resources file
-  You can also specify the font using your X resources file (usually a
-file named @file{.Xdefaults} or @file{.Xresources} in your home
-directory), by adding a line like this:
-
address@hidden
-emacs.font: @var{font}
address@hidden smallexample
-
address@hidden
-You must restart X, or use the @command{xrdb} command, for the X
-resources file to take effect.  @xref{Resources}.  When specifying a
-font in your X resources file, you should not quote it.
-
address@hidden fontconfig
-  Emacs recognizes two types of fonts: @dfn{client-side} fonts, which
-are provided by the Xft and Fontconfig libraries, and
address@hidden fonts, which are provided by the X server itself.
-Most client-side fonts support advanced font features such as
-antialiasing and subpixel hinting, while server-side fonts do not.
-
-  There are four different ways to express a ``font name''.  The first
-format consists of @dfn{Fontconfig patterns}.  Fontconfig patterns
-match only client-side fonts provided by Xft and Fontconfig, and have
-the following form:
-
address@hidden
address@hidden@var{fontsize}][:@address@hidden:@address@hidden
address@hidden smallexample
-
address@hidden
-Within this format, any of the elements in braces may be omitted.
-Here, @var{fontname} is the ``family name'' of the font, such as
address@hidden or @samp{DejaVu Serif}; @var{fontsize} is the ``point
-size'' of the font (one ``printer's point'' is about 1/72 of an inch);
-and the @address@hidden@var{values}} entries specify settings such
-as the slant and weight of the font.  Each @var{values} may be a
-single value, or a list of values separated by commas.  In addition,
-some property values are valid with only one kind of property name, in
-which case the @address@hidden part may be omitted.
-
-Here is a list of common font properties:
-
address@hidden @samp
address@hidden slant
-One of @samp{italic}, @samp{oblique} or @samp{roman}.
-
address@hidden weight
-One of @samp{light}, @samp{medium}, @samp{demibold}, @samp{bold} or
address@hidden
-
address@hidden style
-Some fonts define special styles which are a combination of slant and
-weight.  For instance, the font @samp{Dejavu Sans} defines the style
address@hidden  This property, if specified, overrides the slant and
-weight properties.
-
address@hidden width
-One of @samp{condensed}, @samp{normal}, or @samp{expanded}.
-
address@hidden spacing
-One of @samp{monospace}, @samp{proportional}, @samp{dual-width}, or
address@hidden
address@hidden table
-
address@hidden
-Here are some examples of Fontconfig patterns:
-
address@hidden
-Monospace
-Monospace-12
-Monospace-12:bold
-DejaVu Sans Mono:bold:italic
-Monospace-12:weight=bold:slant=italic
address@hidden smallexample
-
-See the Fontconfig manual for a more detailed description of
-Fontconfig patterns.  This manual is located in the file
address@hidden, which is distributed with Fontconfig.  It
-is also available online at
address@hidden://fontconfig.org/fontconfig-user.html}.  In particular, the
-manual describes additional font properties that influence how the
-font is hinted, antialiased, or scaled.
-
-  The second way to specify a font is to use a @dfn{GTK font
-description}.  Like Fontconfig patterns, GTK font descriptions match
-only client-side fonts provided by Xft and Fontconfig.  They have the
-syntax
-
address@hidden
address@hidden address@hidden address@hidden
address@hidden smallexample
-
address@hidden
-where @var{fontname} is the family name, @var{properties} is a list of
-property values separated by spaces, and @var{fontsize} is the point
-size.  The properties that you may specify are as follows:
-
address@hidden @samp
address@hidden style
-One of @samp{roman}, @samp{italic} or @samp{oblique}.  If omitted, the
address@hidden style is used.
address@hidden weight
-One of @samp{medium}, @samp{ultra-light}, @samp{light},
address@hidden, or @samp{bold}.  If omitted, @samp{medium} weight is
-used.
address@hidden table
-
address@hidden
-Here are some examples of GTK font descriptions:
-
address@hidden
-Monospace 12
-Monospace Bold Italic 12
address@hidden smallexample
-
address@hidden XLFD
address@hidden X Logical Font Description
-  The third way to specify a font is to use an @dfn{XLFD} (@dfn{X
-Logical Font Description}), which is the traditional method for
-specifying fonts under X.  Each XLFD consists of fourteen words or
-numbers, separated by dashes, like this:
-
address@hidden
--misc-fixed-medium-r-semicondensed--13-*-*-*-c-60-iso8859-1
address@hidden smallexample
-
address@hidden
-A wildcard character (@samp{*}) in an XLFD 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.
-Case is insignificant in an XLFD.  The syntax for an XLFD is as
-follows:
-
address@hidden
address@hidden@address@hidden@address@hidden@address@hidden
address@hidden@address@hidden@address@hidden@address@hidden@address@hidden
address@hidden smallexample
-
address@hidden
-The entries have the following meanings:
-
address@hidden @var
address@hidden maker
-The name of the font manufacturer.
address@hidden family
-The name of the font family (e.g. @samp{courier}).
address@hidden weight
-The font weight---normally either @samp{bold}, @samp{medium} or
address@hidden  Some font names support other values.
address@hidden slant
-The font slant---normally @samp{r} (roman), @samp{i} (italic),
address@hidden (oblique), @samp{ri} (reverse italic), or @samp{ot} (other).
-Some font names support other values.
address@hidden widthtype
-The font width---normally @samp{condensed}, @samp{extended},
address@hidden or @samp{normal} (some font names support other
-values).
address@hidden style
-An optional additional style name.  Usually it is empty---most long
-font names have two hyphens in a row at this point.
address@hidden pixels
-The font height, in pixels.
address@hidden height
-The font height on the screen, measured in tenths of a printer's
-point.  This is the point size of the font, times ten.  For a given
-vertical resolution, @var{height} and @var{pixels} are proportional;
-therefore, it is common to specify just one of them and use @samp{*}
-for the other.
address@hidden horiz
-The horizontal resolution, in pixels per inch, of the screen for which
-the font is intended.
address@hidden vert
-The vertical resolution, in pixels per inch, of the screen for which
-the font is intended.  Normally the resolution of the fonts on your
-system is the right value for your screen; therefore, you normally
-specify @samp{*} for this and @var{horiz}.
address@hidden spacing
-This is @samp{m} (monospace), @samp{p} (proportional) or @samp{c}
-(character cell).
address@hidden width
-The average character width, in pixels, multiplied by ten.
address@hidden registry
address@hidden encoding
-The X font character set that the font depicts.  (X font character
-sets are not the same as Emacs character sets, but they are similar.)
-You can use the @command{xfontsel} program to check which choices you
-have.  Normally you should use @samp{iso8859} for @var{registry} and
address@hidden for @var{encoding}.
address@hidden table
-
-  Some fonts have shorter nicknames, which you can use instead of a
-normal font specification.  For instance,
-
address@hidden
--misc-fixed-medium-r-semicondensed--13-*-*-*-c-60-iso8859-1
address@hidden smallexample
-
address@hidden
-is equivalent to @samp{6x13}.  This is the fourth and final method of
-specifying a font.
-
address@hidden listing system fonts
-  You will probably want to use a fixed-width default font---that is,
-a font in which all characters have the same width.  Here's how to use
-the @command{fc-list} command to list all fixed-width Xft and
-Fontconfig fonts available on your system:
-
address@hidden
-fc-list :spacing=mono
-fc-list :spacing=charcell
address@hidden example
-
-  For server-side X fonts, any font with @samp{m} or @samp{c} in the
address@hidden field of the XLFD is a fixed-width font.  Here's how to
-use the @command{xlsfonts} program to list all the fixed-width fonts
-available on your system:
-
address@hidden
-xlsfonts -fn '*x*' | egrep "^[0-9]+x[0-9]+"
-xlsfonts -fn '*-*-*-*-*-*-*-*-*-*-*-m*'
-xlsfonts -fn '*-*-*-*-*-*-*-*-*-*-*-c*'
address@hidden example
-
address@hidden
-To see what a particular font looks like, use the @command{xfd} command.
-For example:
-
address@hidden
-xfd -fn 6x13
address@hidden example
-
address@hidden
-displays the entire font @samp{6x13}.
-
-  While running Emacs, you can set the font of a specific kind of text
-(@pxref{Faces}), or of a particular frame (@pxref{Frame Parameters}).
address@hidden, for other ways to specify the default font and font name
+formats.
 
 @node Colors
 @appendixsec Window Color Options

=== modified file 'doc/emacs/emacs.texi'
--- a/doc/emacs/emacs.texi      2010-03-11 04:03:11 +0000
+++ b/doc/emacs/emacs.texi      2010-03-20 17:24:06 +0000
@@ -502,6 +502,7 @@
 * Mode Line Mouse::     Mouse clicks on the mode line.
 * Creating Frames::     Creating additional Emacs frames with various contents.
 * Frame Commands::      Iconifying, deleting, and switching frames.
+* Fonts::               Changing the frame font.
 * Speedbar::            How to make and use a speedbar frame.
 * Multiple Displays::   How one Emacs job can talk to several displays.
 * Special Buffer Frames::  You can make certain buffers have their own frames.

=== modified file 'doc/emacs/frames.texi'
--- a/doc/emacs/frames.texi     2010-03-02 22:56:36 +0000
+++ b/doc/emacs/frames.texi     2010-03-20 17:24:06 +0000
@@ -39,6 +39,7 @@
 * Mode Line Mouse::     Mouse clicks on the mode line.
 * Creating Frames::     Creating additional Emacs frames with various contents.
 * Frame Commands::      Iconifying, deleting, and switching frames.
+* Fonts::               Changing the frame font.
 * Speedbar::            How to make and use a speedbar frame.
 * Multiple Displays::   How one Emacs job can talk to several displays.
 * Special Buffer Frames::  You can make certain buffers have their own frames.
@@ -571,25 +572,19 @@
 Lisp Reference Manual}, for more information.
 
 @cindex font (default)
-  For instance, one way to specify the principal font for all your
-Emacs frames is to modify @code{default-frame-alist} to specify the
address@hidden parameter (@pxref{Font X}):
+  Here is an example of using @code{default-frame-alist} to specify
+the default foreground color and font:
 
 @example
 (add-to-list 'default-frame-alist '(font . "10x20"))
address@hidden example
-
address@hidden
-Here's a similar example for specifying a foreground color:
-
address@hidden
 (add-to-list 'default-frame-alist '(foreground-color . "blue"))
 @end example
 
 @noindent
 By putting such customizations in your init file, you can control the
-appearance of all the frames Emacs creates, including the initial one.
address@hidden File}.
+appearance of all the frames Emacs creates, including the initial one
+(@pxref{Init File}).  @xref{Fonts}, for other ways to set the default
+font.
 
 @node Frame Commands
 @section Frame Commands
@@ -645,6 +640,278 @@
 a frame that raises, so this variable has no effect in the native
 MS-Windows build of Emacs.
 
address@hidden Fonts
address@hidden Fonts
address@hidden fonts
+
+  By default, Emacs displays text in X using a 12-point monospace
+font.  There are several different ways to specify a different font:
+
address@hidden
address@hidden
+Click on @samp{Set Default Font} in the @samp{Options} menu.  To save
+this for future sessions, click on @samp{Save Options} in the
address@hidden menu.
+
address@hidden
+Add a line to your init file (@pxref{Init File}), modifying the
+variable @code{default-frame-alist} to specify the @code{font}
+parameter (@pxref{Creating Frames}), like this:
+
address@hidden
+(add-to-list 'default-frame-alist '(font . "DejaVu Sans Mono-12"))
address@hidden smallexample
+
address@hidden X defaults file
address@hidden X resources file
address@hidden
+Add an @samp{emacs.font} X resource setting to your X resource file,
+like this:
+
address@hidden
+emacs.font: DejaVu Sans Mono-12
address@hidden smallexample
+
address@hidden
+You must restart X, or use the @command{xrdb} command, for the X
+resources file to take effect.  @xref{Resources}.  When specifying a
+font in your X resources file, you should not quote it.
+
address@hidden
+If you are running Emacs on the GNOME desktop, you can tell Emacs to
+use the default system font by setting the variable
address@hidden to @code{t} (the default is @code{nil}).
+For this to work, Emacs must be compiled with Gconf support; this is
+done automatically if the libraries are present at compile time.
+
address@hidden
+Use the command line option @samp{-fn} (or @samp{--font}).  @xref{Font
+X}.
address@hidden itemize
+
address@hidden fontconfig
+  On X, there are four different ways to express a ``font name''.  The
+first is to use a @dfn{Fontconfig pattern}.  Fontconfig patterns have
+the following form:
+
address@hidden
address@hidden@var{fontsize}][:@address@hidden:@address@hidden
address@hidden smallexample
+
address@hidden
+Within this format, any of the elements in braces may be omitted.
+Here, @var{fontname} is the @dfn{family name} of the font, such as
address@hidden or @samp{DejaVu Serif}; @var{fontsize} is the
address@hidden size} of the font (one @dfn{printer's point} is about 1/72
+of an inch); and the @address@hidden@var{values}} entries specify
+settings such as the slant and weight of the font.  Each @var{values}
+may be a single value, or a list of values separated by commas.  In
+addition, some property values are valid with only one kind of
+property name, in which case the @address@hidden part may be
+omitted.
+
+Here is a list of common font properties:
+
address@hidden @samp
address@hidden slant
+One of @samp{italic}, @samp{oblique} or @samp{roman}.
+
address@hidden weight
+One of @samp{light}, @samp{medium}, @samp{demibold}, @samp{bold} or
address@hidden
+
address@hidden style
+Some fonts define special styles which are a combination of slant and
+weight.  For instance, @samp{Dejavu Sans} defines the @samp{book}
+style, which overrides the slant and weight properties.
+
address@hidden width
+One of @samp{condensed}, @samp{normal}, or @samp{expanded}.
+
address@hidden spacing
+One of @samp{monospace}, @samp{proportional}, @samp{dual-width}, or
address@hidden
address@hidden table
+
address@hidden
+Here are some examples of Fontconfig patterns:
+
address@hidden
+Monospace
+Monospace-12
+Monospace-12:bold
+DejaVu Sans Mono:bold:italic
+Monospace-12:weight=bold:slant=italic
address@hidden smallexample
+
+See the Fontconfig manual for a more detailed description of
+Fontconfig patterns.  This manual is located in the file
address@hidden, distributed with Fontconfig.  It is also
+available online at @url{http://fontconfig.org/fontconfig-user.html}.
+In particular, that manual describes additional font properties that
+influence how the font is hinted, antialiased, or scaled.
+
+  The second way to specify a font is to use a @dfn{GTK font
+description}.  These have the syntax
+
address@hidden
address@hidden address@hidden address@hidden
address@hidden smallexample
+
address@hidden
+where @var{fontname} is the family name, @var{properties} is a list of
+property values separated by spaces, and @var{fontsize} is the point
+size.  The properties that you may specify are as follows:
+
address@hidden @samp
address@hidden style
+One of @samp{roman}, @samp{italic} or @samp{oblique}.  If omitted, the
address@hidden style is used.
address@hidden weight
+One of @samp{medium}, @samp{ultra-light}, @samp{light},
address@hidden, or @samp{bold}.  If omitted, @samp{medium} weight is
+used.
address@hidden table
+
address@hidden
+Here are some examples of GTK font descriptions:
+
address@hidden
+Monospace 12
+Monospace Bold Italic 12
address@hidden smallexample
+
address@hidden XLFD
address@hidden X Logical Font Description
+  The third way to specify a font is to use an @dfn{XLFD} (@dfn{X
+Logical Font Description}).  This is the traditional method for
+specifying fonts under X.  Each XLFD consists of fourteen words or
+numbers, separated by dashes, like this:
+
address@hidden
+-misc-fixed-medium-r-semicondensed--13-*-*-*-c-60-iso8859-1
address@hidden smallexample
+
address@hidden
+A wildcard character (@samp{*}) in an XLFD 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.
+Case is insignificant in an XLFD.  The syntax for an XLFD is as
+follows:
+
address@hidden
address@hidden@address@hidden@address@hidden@address@hidden
address@hidden@address@hidden@address@hidden@address@hidden@address@hidden
address@hidden smallexample
+
address@hidden
+The entries have the following meanings:
+
address@hidden @var
address@hidden maker
+The name of the font manufacturer.
address@hidden family
+The name of the font family (e.g. @samp{courier}).
address@hidden weight
+The font weight---normally either @samp{bold}, @samp{medium} or
address@hidden  Some font names support other values.
address@hidden slant
+The font slant---normally @samp{r} (roman), @samp{i} (italic),
address@hidden (oblique), @samp{ri} (reverse italic), or @samp{ot} (other).
+Some font names support other values.
address@hidden widthtype
+The font width---normally @samp{condensed}, @samp{extended},
address@hidden or @samp{normal} (some font names support other
+values).
address@hidden style
+An optional additional style name.  Usually it is empty---most long
+font names have two hyphens in a row at this point.
address@hidden pixels
+The font height, in pixels.
address@hidden height
+The font height on the screen, measured in tenths of a printer's
+point.  This is the point size of the font, times ten.  For a given
+vertical resolution, @var{height} and @var{pixels} are proportional;
+therefore, it is common to specify just one of them and use @samp{*}
+for the other.
address@hidden horiz
+The horizontal resolution, in pixels per inch, of the screen for which
+the font is intended.
address@hidden vert
+The vertical resolution, in pixels per inch, of the screen for which
+the font is intended.  Normally the resolution of the fonts on your
+system is the right value for your screen; therefore, you normally
+specify @samp{*} for this and @var{horiz}.
address@hidden spacing
+This is @samp{m} (monospace), @samp{p} (proportional) or @samp{c}
+(character cell).
address@hidden width
+The average character width, in pixels, multiplied by ten.
address@hidden registry
address@hidden encoding
+The X font character set that the font depicts.  (X font character
+sets are not the same as Emacs character sets, but they are similar.)
+You can use the @command{xfontsel} program to check which choices you
+have.  Normally you should use @samp{iso8859} for @var{registry} and
address@hidden for @var{encoding}.
address@hidden table
+
+  The fourth and final method of specifying a font is to use a ``font
+nickname''.  Certain fonts have shorter nicknames, which you can use
+instead of a normal font specification.  For instance, @samp{6x13} is
+equivalent to
+
address@hidden
+-misc-fixed-medium-r-semicondensed--13-*-*-*-c-60-iso8859-1
address@hidden smallexample
+
address@hidden client-side fonts
address@hidden server-side fonts
+  On X, Emacs recognizes two types of fonts: @dfn{client-side} fonts,
+which are provided by the Xft and Fontconfig libraries, and
address@hidden fonts, which are provided by the X server itself.
+Most client-side fonts support advanced font features such as
+antialiasing and subpixel hinting, while server-side fonts do not.
+Fontconfig and GTK patterns match only client-side fonts.
+
address@hidden listing system fonts
+  You will probably want to use a fixed-width default font---that is,
+a font in which all characters have the same width.  For Xft and
+Fontconfig fonts, you can use the @command{fc-list} command to list
+the available fixed-width fonts, like this:
+
address@hidden
+fc-list :spacing=mono fc-list :spacing=charcell
address@hidden example
+
address@hidden
+For server-side X fonts, you can use the @command{xlsfonts} program to
+list the available fixed-width fonts, like this:
+
address@hidden
+xlsfonts -fn '*x*' | egrep "^[0-9]+x[0-9]+"
+xlsfonts -fn '*-*-*-*-*-*-*-*-*-*-*-m*'
+xlsfonts -fn '*-*-*-*-*-*-*-*-*-*-*-c*'
address@hidden example
+
address@hidden
+Any font with @samp{m} or @samp{c} in the @var{spacing} field of the
+XLFD is a fixed-width font.  To see what a particular font looks like,
+use the @command{xfd} command.  For example:
+
address@hidden
+xfd -fn 6x13
address@hidden example
+
address@hidden
+displays the entire font @samp{6x13}.
+
+  While running Emacs, you can also set the font of a specific kind of
+text (@pxref{Faces}), or a particular frame (@pxref{Frame
+Parameters}).
+
 @node Speedbar
 @section Speedbar Frames
 @cindex speedbar

=== modified file 'doc/emacs/mule.texi'
--- a/doc/emacs/mule.texi       2010-01-13 08:35:10 +0000
+++ b/doc/emacs/mule.texi       2010-03-20 17:24:06 +0000
@@ -1442,7 +1442,7 @@
 fontset is called @code{create-fontset-from-fontset-spec}.  You can also
 call this function explicitly to create a fontset.
 
-  @xref{Font X}, for more information about font naming in X.
+  @xref{Fonts}, for more information about font naming.
 
 @node Modifying Fontsets
 @section Modifying Fontsets
@@ -1619,7 +1619,7 @@
 that you don't have to worry about them.  However, it is sometimes
 helpful to know some of the underlying details about charsets.
 
-  One example is font selection (@pxref{Font X}).  Each language
+  One example is font selection (@pxref{Fonts}).  Each language
 environment (@pxref{Language Environments}) defines a ``priority
 list'' for the various charsets.  When searching for a font, Emacs
 initially attempts to find one that can display the highest-priority

=== modified file 'doc/emacs/xresources.texi'
--- a/doc/emacs/xresources.texi 2010-01-13 08:35:10 +0000
+++ b/doc/emacs/xresources.texi 2010-03-20 17:24:06 +0000
@@ -193,7 +193,7 @@
 @end ifnottex
 
 @item @code{font} (class @code{Font})
-Font name for the @code{default} font.  @xref{Font X}.  You can also
+Font name for the @code{default} font.  @xref{Fonts}.  You can also
 specify a fontset name (@pxref{Fontsets}).
 
 @item @code{fontBackend} (class @code{FontBackend})

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2010-03-06 20:35:04 +0000
+++ b/etc/NEWS  2010-03-20 17:24:06 +0000
@@ -71,14 +71,14 @@
 Customize `make-pointer-invisible' to disable this feature.
 
 ** Font changes
-
++++
 *** Emacs can use the system default monospaced font in Gnome.
 To enable this feature, set `font-use-system-font' to non-nil (it is
 nil by default).  If the system default changes, Emacs changes also.
 This feature requires Gconf support, which is automatically included
 at compile-time if configure detects the gconf libraries (you can
 disable this with the configure option --without-gconf).
-
+---
 *** On X11, Emacs reacts to Xft changes made by configuration tools,
 via the XSETTINGS mechanism.  This includes antialias, hinting,
 hintstyle, RGBA, DPI and lcdfilter changes.