Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-252
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-253
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-254
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-255
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-256
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-257
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-258
   Clean up lisp/gnus/ChangeLog a bit

 * emacs@sv.gnu.org/emacs--devo--0--patch-259
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-260
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-261
   lisp/replace.el (occur-engine): Bind `inhibit-field-text-motion' to t

 * emacs@sv.gnu.org/emacs--devo--0--patch-262
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-96
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-97
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-98
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-554

7 files changed, 260 insertions, 123 deletions

diff --git a/man/ChangeLog b/man/ChangeLog
index 1f417968fa9..bd48e3f4f20 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,16 +1,46 @@
+2006-05-01  Richard Stallman  <rms@gnu.org>
+
+        * emacs.texi (Top): Add Diff Mode to menu.
+
+2006-05-01  Aaron S. Hawley  <Aaron.Hawley@uvm.edu>
+
+        * misc.texi (Diff Mode): New node.
+
+2006-05-01  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macos.texi (Mac International): Now Carbon Emacs has ATSUI support.
+        (Mac Environment Variables): Shorten example line.
+        (Mac Font Specs): Shorten lisp lines.  Add descriptions for ATSUI.
+
+2006-05-01  Nick Roberts  <nickrob@snap.net.nz>
+
+        * building.texi (GUD Customization): Describe cases %d and %c.
+        Update description for %e.
+
+2006-04-30  Glenn Morris  <rgm@gnu.org>
+
+        * calendar.texi (LaTeX Calendar): Mention cal-tex-preamble-extra.
+
+2006-04-29  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * custom.texi (Examining): Update C-h v output example.
+
+2006-04-29  Kim F. Storm  <storm@cua.dk>
+
+        * building.texi (Grep Searching): Add lgrep and rgrep.
+
 2006-04-26  Reiner Steib  <Reiner.Steib@gmx.de>
 
         * pgg.texi (Caching passphrase): Fix markup and typos.  Simplify.
 
 2006-04-26  Sascha Wilde  <wilde@sha-bang.de>
 
-        * pgg.texi (Caching passphrase): Added documentation for
-        pgg-gpg-use-agent.
+        * pgg.texi (Caching passphrase): Add pgg-gpg-use-agent.
 
 2006-04-24  Bill Wohler  <wohler@newt.com>
 
-        * mh-e.texi (Getting Started): Made it more explicit that you need
-        to install MH, and also included pointers to current MH implementations.
+        * mh-e.texi (Getting Started): Make it more explicit that you need
+        to install MH.  Add pointers to current MH implementations.
 
 2006-04-23  Richard Stallman  <rms@gnu.org>
 
@@ -24,14 +54,14 @@
 2006-04-21  Bill Wohler  <wohler@newt.com>
 
         Release MH-E manual version 7.94.
-        
+
         * mh-e.texi (VERSION, EDITION, UPDATED, UPDATE-MONTH): Update for
         release 7.94.
 
 2006-04-21  Carsten Dominik  <dominik@science.uva.nl>
 
         * org.texi: Many small fixes.
-        (Handling links): Renamed from "Managing links".
+        (Handling links): Rename from "Managing links".
 
 2006-04-21  Eli Zaretskii  <eliz@gnu.org>
 
@@ -57,7 +87,7 @@
 
 2006-04-20  Carsten Dominik  <dominik@science.uva.nl>
 
-        * org.texi: (Time stamps): Better explanation of the purpose of
+        * org.texi (Time stamps): Better explanation of the purpose of
         different time stamps.
         (Structure editing, Plain lists): More details on how new items
         and headings are inserted.
@@ -74,7 +104,7 @@
 
 2006-04-18  Carsten Dominik  <dominik@science.uva.nl>
 
-        * org.texi: (Formula syntax): Fixed link to Calc Manual.
+        * org.texi (Formula syntax): Fixed link to Calc Manual.
 
 2006-04-17  Reiner Steib  <Reiner.Steib@gmx.de>
 
@@ -96,7 +126,7 @@
 
 2006-04-13  Carsten Dominik  <dominik@science.uva.nl>
 
-        * org.texi: (Updating settings): New section.
+        * org.texi (Updating settings): New section.
         (Visibility cycling): Better names for the startup folding
         options.
         (Exporting): Completely restructured.
diff --git a/man/building.texi b/man/building.texi
index cc5e667f1c3..0cbaa5d1826 100644
--- a/man/building.texi
+++ b/man/building.texi
@@ -335,10 +335,12 @@ treating the matches reported by @code{grep} as if they were ``errors.''
 
 @table @kbd
 @item M-x grep
+@item M-x lgrep
 Run @code{grep} asynchronously under Emacs, with matching lines
 listed in the buffer named @samp{*grep*}.
 @item M-x grep-find
 @itemx M-x find-grep
+@itemx M-x rgrep
 Run @code{grep} via @code{find}, with user-specified arguments, and
 collect output in the buffer named @samp{*grep*}.
 @item M-x kill-grep
@@ -373,6 +375,27 @@ initial default for the command---one that runs both @code{find} and
 @code{grep}, so as to search every file in a directory tree.  See also
 the @code{find-grep-dired} command, in @ref{Dired and Find}.
 
+@findex lgrep
+@findex rgrep
+  The commands @kbd{M-x lgrep} (local grep) and @kbd{M-x rgrep}
+(recursive grep) are more user-friendly versions of @code{grep} and
+@code{grep-find}, which prompt separately for the regular expression
+to match, the files to search, and the base directory for the search
+(rgrep only).  Case sensitivitivy of the search is controlled by the
+current value of @code{case-fold-search}.
+
+These commands build the shell commands based on the variables
+@code{grep-template} (for @code{lgrep}) and @code{grep-find-template}
+(for @code{rgrep}).
+
+The files to search can use aliases defined in the variable
+@code{grep-files-aliases}.
+
+Subdirectories listed in the variable
+@code{grep-find-ignored-directories} such as those typically used by
+various version control systems, like CVS and arch, are automatically
+skipped by @code{rgrep}.
+
 @node Flymake
 @section Finding Syntax Errors On The Fly
 @cindex checking syntax
@@ -676,7 +699,7 @@ This key is available only in the GUD interaction buffer.
 @kindex C-c C-f @r{(GUD)}
 @itemx C-x C-a C-f
 @findex gud-finish
-Run the program until the selected stack frame returns or 
+Run the program until the selected stack frame returns or
 stops for some other reason (@code{gud-finish}).
 
 @item C-x C-a C-j
@@ -743,8 +766,6 @@ the command to @kbd{C-c @var{binding}} in the GUD buffer's mode and to
 The name of the current source file.  If the current buffer is the GUD
 buffer, then the ``current source file'' is the file that the program
 stopped in.
-@c This said, ``the name of the file the program counter was in at the last breakpoint.''
-@c But I suspect it is really the last stop file.
 
 @item %l
 The number of the current source line.  If the current buffer is the GUD
@@ -752,7 +773,9 @@ buffer, then the ``current source line'' is the line that the program
 stopped in.
 
 @item %e
-The text of the C lvalue or function-call expression at or adjacent to point.
+In transient-mark-mode the text in the region, if it is active.
+Otherwise the text of the C lvalue or function-call expression at or
+adjacent to point.
 
 @item %a
 The text of the hexadecimal address at or adjacent to point.
@@ -764,6 +787,13 @@ empty string.
 
 If you don't use @samp{%p} in the command string, the command you define
 ignores any numeric argument.
+
+@item %d
+The name of the directory of the current source file.
+
+@item %c
+Fully qualified class name derived from the expression surrounding point
+(jdb only).
 @end table
 
 @node GDB Graphical Interface
diff --git a/man/calendar.texi b/man/calendar.texi
index 23aeb191e86..b48b1d547de 100644
--- a/man/calendar.texi
+++ b/man/calendar.texi
@@ -395,7 +395,9 @@ If the variable @code{cal-tex-diary} is non-@code{nil} (the default is
 @code{nil}), diary entries are included also (in weekly and monthly
 calendars only).  If the variable @code{cal-tex-rules} is non-@code{nil}
 (the default is @code{nil}), the calendar displays ruled pages
-in styles that have sufficient room.
+in styles that have sufficient room.  You can use the variable
+@code{cal-tex-preamble-extra} to insert extra LaTeX commands in the
+preamble of the generated document if you need to.
 
 @node Holidays
 @section Holidays
diff --git a/man/custom.texi b/man/custom.texi
index f133e890b0a..35c9222628c 100644
--- a/man/custom.texi
+++ b/man/custom.texi
@@ -822,6 +822,9 @@ fill-column's value is 70
 Local in buffer custom.texi; global value is 70
 Automatically becomes buffer-local when set in any fashion.
 
+This variable is safe to use as a file local variable only if its value
+satisfies the predicate `integerp'.
+
 Documentation:
 *Column beyond which automatic line-wrapping should happen.
 Interactively, you can set the buffer local value using C-x f.
diff --git a/man/emacs.texi b/man/emacs.texi
index 478244aecf6..c30bcb93954 100644
--- a/man/emacs.texi
+++ b/man/emacs.texi
@@ -89,9 +89,9 @@ some of how to customize it; it corresponds to GNU Emacs version
 @value{EMACSVER}.
 
 @ifinfo
-If you never before used the Info documentation system, type @kbd{h},
-and Emacs will take you to a programmed instruction sequence for the
-Info commands.
+To learn more about the Info documentation system, type @kbd{h}, and
+Emacs will take you to a programmed instruction sequence for the Info
+commands.
 @end ifinfo
 
 For information on extending Emacs, see @ref{Top, Emacs Lisp,, elisp, The
@@ -197,6 +197,7 @@ Advanced Features
 * Sorting::             Sorting lines, paragraphs or pages within Emacs.
 * Narrowing::           Restricting display and editing to a portion
                           of the buffer.
+* Diff Mode::           Editing diff output.
 * Two-Column::          Splitting apart columns to edit them
                           in side-by-side windows.
 * Editing Binary Files::Using Hexl mode to edit binary files.
@@ -286,7 +287,7 @@ Killing and Moving Text
 * Killing by Lines::    How to kill entire lines of text at one time.
 * Other Kill Commands:: Commands to kill large regions of text and
                           syntactic units such as words and sentences.
-* Graphical Kill::      The kill ring on graphical terminals:
+* Graphical Kill::      The kill ring on graphical displays:
                           yanking between applications.
 * CUA Bindings::        Using @kbd{C-x}, @kbd{C-c}, @kbd{C-v} for copy
                           and paste, with enhanced rectangle support.
@@ -867,47 +868,47 @@ Emacs and Microsoft Windows
 @unnumbered Preface
 
   This manual documents the use and simple customization of the Emacs
-editor.  The reader is not expected to be a programmer; simple
-customizations do not require programming skill.  The user who is not
-interested in customizing can ignore the scattered customization hints.
+editor.  Simple Emacs customizations do not require you to be a
+programmer, but if you are not interested in customizing, you can
+ignore the customization hints.
 
   This is primarily a reference manual, but can also be used as a
-primer.  For complete beginners, it is a good idea to start with the
-on-line, learn-by-doing tutorial, before reading the manual.  To run the
-tutorial, start Emacs and type @kbd{C-h t}.  This way you can learn
-Emacs by using Emacs on a specially designed file which describes
-commands, tells you when to try them, and then explains the results you
-see.
+primer.  If you are a complete beginner, we recommend you start with
+the on-line, learn-by-doing tutorial, before reading the manual.  To
+run the tutorial, start Emacs and type @kbd{C-h t}.  The tutorial
+describes commands, tells you when to try them, and explains the
+results.
 
   On first reading, just skim chapters 1 and 2, which describe the
 notational conventions of the manual and the general appearance of the
 Emacs display screen.  Note which questions are answered in these
 chapters, so you can refer back later.  After reading chapter 4, you
-should practice the commands there.  The next few chapters describe
-fundamental techniques and concepts that are used constantly.  You need
-to understand them thoroughly, experimenting with them if necessary.
+should practice the commands shown there.  The next few chapters
+describe fundamental techniques and concepts that are used constantly.
+You need to understand them thoroughly, so experiment with them
+until you are fluent.
 
   Chapters 14 through 19 describe intermediate-level features that are
-useful for all kinds of editing.  Chapter 20 and following chapters
-describe features that you may or may not want to use; read those
-chapters when you need them.
+useful for many kinds of editing.  Chapter 20 and following chapters
+describe optional but useful features; read those chapters when you
+need them.
 
   Read the Trouble chapter if Emacs does not seem to be working
-properly.  It explains how to cope with some common problems
+properly.  It explains how to cope with several common problems
 (@pxref{Lossage}), as well as when and how to report Emacs bugs
 (@pxref{Bugs}).
 
-  To find the documentation on a particular command, look in the index.
-Keys (character commands) and command names have separate indexes.  There
-is also a glossary, with a cross reference for each term.
+  To find the documentation of a particular command, look in the index.
+Keys (character commands) and command names have separate indexes.
+There is also a glossary, with a cross reference for each term.
 
   This manual is available as a printed book and also as an Info file.
-The Info file is for on-line perusal with the Info program, which will
-be the principal way of viewing documentation on-line in the GNU system.
-Both the Info file and the Info program itself are distributed along
-with GNU Emacs.  The Info file and the printed book contain
-substantially the same text and are generated from the same source
-files, which are also distributed along with GNU Emacs.
+The Info file is for on-line perusal with the Info program, which is
+the principal means of accessing on-line documentation in the GNU
+system.  Both the Emacs Info file and an Info reader are included with
+GNU Emacs.  The Info file and the printed book contain substantially
+the same text and are generated from the same source files, which are
+also distributed with GNU Emacs.
 
   GNU Emacs is a member of the Emacs editor family.  There are many
 Emacs editors, all sharing common principles of organization.  For
@@ -1058,59 +1059,51 @@ T.@: Zimmermann, Reto Zimmermann, Neal Ziring, and Detlev Zundel.
 @node Intro, Glossary, Distrib, Top
 @unnumbered Introduction
 
-  You are reading about GNU Emacs, the GNU incarnation of the advanced,
-self-documenting, customizable, extensible real-time display editor Emacs.
+  You are reading about GNU Emacs, the GNU incarnation of the
+advanced, self-documenting, customizable, extensible editor Emacs.
 (The `G' in `GNU' is not silent.)
 
-  We say that Emacs is a @dfn{display} editor because normally the text
-being edited is visible on the screen and is updated automatically as you
-type your commands.  @xref{Screen,Display}.
-
-  We call it a @dfn{real-time} editor because the display is updated very
-frequently, usually after each character or pair of characters you
-type.  This minimizes the amount of information you must keep in your
-head as you edit.  @xref{Basic,Real-time,Basic Editing}.
-
-  We call Emacs advanced because it provides facilities that go beyond
-simple insertion and deletion: controlling subprocesses; automatic
-indentation of programs; viewing two or more files at once; editing
-formatted text; and dealing in terms of characters, words, lines,
-sentences, paragraphs, and pages, as well as expressions and comments in
-several different programming languages.
+  We call Emacs advanced because it provides much more than simple
+insertion and deletion.  It can control subprocesses, indent programs
+automatically, show two or more files at once, and edit formatted
+text.  Emacs editing commands operate in terms of characters, words,
+lines, sentences, paragraphs, and pages, as well as expressions and
+comments in various programming languages.
 
   @dfn{Self-documenting} means that at any time you can type a special
 character, @kbd{Control-h}, to find out what your options are.  You can
 also use it to find out what any command does, or to find all the commands
 that pertain to a topic.  @xref{Help}.
 
-  @dfn{Customizable} means that you can change the definitions of Emacs
-commands in little ways.  For example, if you use a programming language in
-which comments start with @samp{<**} and end with @samp{**>}, you can tell
-the Emacs comment manipulation commands to use those strings
-(@pxref{Comments}).  Another sort of customization is rearrangement of the
-command set.  For example, if you prefer the four basic cursor motion
-commands (up, down, left and right) on keys in a diamond pattern on the
-keyboard, you can rebind the keys that way.  @xref{Customization}.
-
-  @dfn{Extensible} means that you can go beyond simple customization and
-write entirely new commands, programs in the Lisp language to be run by
-Emacs's own Lisp interpreter.  Emacs is an ``on-line extensible''
-system, which means that it is divided into many functions that call
-each other, any of which can be redefined in the middle of an editing
-session.  Almost any part of Emacs can be replaced without making a
-separate copy of all of Emacs.  Most of the editing commands of Emacs
-are written in Lisp; the few exceptions could have been written
-in Lisp but are written in C for efficiency.  Although only a programmer
-can write an extension, anybody can use it afterward.  @xref{Top,
-Emacs Lisp Intro, Preface, eintr, An Introduction to Programming in
-Emacs Lisp}, if you want to learn Emacs Lisp programming.
+  @dfn{Customizable} means that you can alter Emacs commands' behavior
+in simple ways.  For example, if you use a programming language in
+which comments start with @samp{<**} and end with @samp{**>}, you can
+tell the Emacs comment manipulation commands to use those strings
+(@pxref{Comments}).  Another sort of customization is rearrangement of
+the command set.  For example, you can rebind the basic cursor motion
+commands (up, down, left and right) to any keys on the keyboard that
+you find comfortable.  @xref{Customization}.
+
+  @dfn{Extensible} means that you can go beyond simple customization
+and write entirely new commands---programs in the Lisp language to be
+run by Emacs's own Lisp interpreter.  Emacs is an ``on-line
+extensible'' system, which means that it is divided into many
+functions that call each other, any of which can be redefined in the
+middle of an editing session.  Almost any part of Emacs can be
+replaced without making a separate copy of all of Emacs.  Most of the
+editing commands of Emacs are written in Lisp; the few exceptions
+could have been written in Lisp but use C instead for efficiency.
+Writing an extension is programming, but non-programmers can use it
+afterwards.  @xref{Top, Emacs Lisp Intro, Preface, eintr, An
+Introduction to Programming in Emacs Lisp}, if you want to learn Emacs
+Lisp programming.
 
    When running on a graphical display, Emacs provides its own menus
-and convenient handling of mouse buttons.  But Emacs provides many of
-the benefits of a graphical display even on a text-only terminal.  For
-instance, it can highlight parts of a file, display and edit several
-files at once, move text between files, and edit files while running
-shell commands.
+and convenient handling of mouse buttons.  In addition, Emacs provides
+many of the benefits of a graphical display even on a text-only
+terminal.  For instance, it can highlight parts of a file, display and
+edit several files at once, move text between files, and edit files
+while running shell commands.
 
 @include screen.texi
 @include commands.texi
diff --git a/man/macos.texi b/man/macos.texi
index 89ce13d1d1b..272609b8392 100644
--- a/man/macos.texi
+++ b/man/macos.texi
@@ -104,13 +104,6 @@ character codes in the range 128-159.  The coding systems
 @code{mac-roman}, @code{mac-centraleurroman}, and @code{mac-cyrillic}
 are used to represent these Mac encodings.
 
-  The fontset @code{fontset-standard} is created automatically when
-Emacs is run on Mac, and used by default.  It displays as many kinds
-of characters as possible using 12-point Monaco as a base font.  If
-you see some character as a hollow box with this fontset, then it's
-almost impossible to display it only by customizing font settings
-(@pxref{Mac Font Specs}).
-
   You can use input methods provided either by LEIM (@pxref{Input
 Methods}) or Mac OS to enter international characters.  To use the
 former, see the International Character Set Support section of the
@@ -195,7 +188,7 @@ invoked from the Finder or the @command{open} command.
   Command line arguments are specified like
 
 @example
-/Applications/Emacs.app/Contents/MacOS/Emacs -geometry 80x25 &
+/Applications/Emacs.app/Contents/MacOS/Emacs -g 80x25 &
 @end example
 
 @noindent
@@ -295,7 +288,8 @@ you specify face attributes instead.  For example, you can use 14pt
 Courier by customizing the default face attributes for all frames:
 
 @lisp
-(set-face-attribute 'default nil :family "courier" :height 140)
+(set-face-attribute 'default nil
+                    :family "courier" :height 140)
 @end lisp
 
 @noindent
@@ -313,21 +307,30 @@ standard X font name:
 @noindent
 @xref{Font X}.  Wildcards are supported as they are on X.
 
-  Native Apple fonts in Mac Roman encoding has maker name @code{apple}
-and charset @code{mac-roman}.  For example 12-point Monaco can be
-specified by the name @samp{-apple-monaco-*-12-*-mac-roman}.  When
-using a particular size of scalable fonts, it must be specified in a
-format containing 14 @samp{-}s like
-@samp{-apple-monaco-medium-r-normal--13-*-*-*-*-*-mac-roman}.
-
-  You can specify a @code{mac-roman} font for @acronym{ASCII}
-characters like
-
-@lisp
+  Emacs on Mac OS Classic uses QuickDraw Text routines for drawing texts
+by default.  Emacs on Mac OS X uses @acronym{ATSUI, Apple Type Services
+for Unicode Imaging} as well as QuickDraw Text, and most of the
+characters other than Chinese, Japanese, and Korean ones are drawn using
+the former by default.
+
+  @acronym{ATSUI}-compatible fonts have maker name @code{apple} and
+charset @code{iso10646-1}.  For example 12-point Monaco can be specified
+by the name
+@samp{-apple-monaco-medium-r-normal--12-*-*-*-*-*-iso10646-1}.  Note
+that it must be specified in a format containing 14 @samp{-}s (i.e., not
+by @samp{-apple-monaco-medium-r-normal-12-*-iso10646-1}) because every
+@acronym{ATSUI}-compatible font is a scalable one.
+
+  QuickDraw Text fonts have maker name @code{apple} and various charset
+names other than @code{iso10646-1}.  Native Apple fonts in Mac Roman
+encoding has charset @code{mac-roman}.  You can specify a
+@code{mac-roman} font for @acronym{ASCII} characters like
+
+@smalllisp
 (add-to-list
  'default-frame-alist
  '(font . "-apple-monaco-medium-r-normal--13-*-*-*-*-*-mac-roman"))
-@end lisp
+@end smalllisp
 
 @noindent
 but that does not extend to ISO-8859-1: specifying a @code{mac-roman}
@@ -341,16 +344,11 @@ charsets @samp{big5-0}, @samp{gb2312.1980-0},
 @samp{mac-cyrillic}, @samp{mac-symbol}, and @samp{mac-dingbats},
 respectively.
 
-  Since Emacs as of the current version uses QuickDraw Text routines
-for drawing texts, only characters in the charsets listed above can be
-displayed with the OS-bundled fonts, even if other applications that
-use @acronym{ATSUI} or Cocoa can display variety of characters with
-them.
-
   The use of @code{create-fontset-from-fontset-spec} (@pxref{Defining
-Fontsets}) for defining fontsets often results in wrong ones
-especially when using only OS-bundled fonts.  The recommended way is
-to create a fontset using @code{create-fontset-from-mac-roman-font}:
+Fontsets}) for defining fontsets often results in wrong ones especially
+when using only OS-bundled QuickDraw Text fonts.  The recommended way to
+use them is to create a fontset using
+@code{create-fontset-from-mac-roman-font}:
 
 @lisp
 (create-fontset-from-mac-roman-font
@@ -374,11 +372,13 @@ encoded in the names of their font suitcases.  E.g., the font suitcase
 the name @samp{-ETL-fixed-*-iso8859-1}.
 
 @vindex mac-allow-anti-aliasing
-  Emacs uses the QuickDraw text rendering by default.  On Mac OS X
-10.2 and later, it can be changed so that it uses the Quartz 2D text
-rendering (aka CG text rendering) by setting
-@code{mac-allow-anti-aliasing} to @code{t}.  However, it is reported
-to sometimes leave some garbages.
+  Mac OS X 10.2 or later can use two types of text renderings: Quartz 2D
+(aka Core Graphics) and QuickDraw.  By default, Emacs uses the former on
+such versions.  It can be changed by setting
+@code{mac-allow-anti-aliasing} to @code{t} (Quartz 2D) or @code{nil}
+(QuickDraw).  Both @acronym{ATSUI} and QuickDraw Text drawings are
+affected by the value of this variable.
+
 
 @node Mac Functions
 @section Mac-Specific Lisp Functions
diff --git a/man/misc.texi b/man/misc.texi
index 0b07e04ed68..71f4aba2b49 100644
--- a/man/misc.texi
+++ b/man/misc.texi
@@ -1761,7 +1761,7 @@ rectangle moves along with the text inside the rectangle.
   Many of the sort commands ignore case differences when comparing, if
 @code{sort-fold-case} is non-@code{nil}.
 
-@node Narrowing, Two-Column, Sorting, Top
+@node Narrowing, Diff Mode, Sorting, Top
 @section Narrowing
 @cindex widening
 @cindex restriction
@@ -1827,7 +1827,86 @@ this command asks for confirmation and gives you the option of enabling it;
 if you enable the command, confirmation will no longer be required for
 it.  @xref{Disabling}.
 
-@node Two-Column, Editing Binary Files, Narrowing, Top
+@node Diff Mode, Two-Column, Narrowing, Top
+@section Diff Mode
+@cindex Diff mode
+
+  Diff mode is useful for editing patches and comparisons produced by
+the @command{diff} program.  You can select Diff mode by typing
+@kbd{M-x diff-mode}; Emacs commands that compare files automatically
+select Diff mode.  @xref{Top,, Diff, diff, Comparing and Merging Files},
+for more information about @command{diff} output formats.
+
+  One general feature of Diff mode is that manual edits to the patch
+automatically correct line numbers, including those in the hunk
+header, so that you can actually apply the edited patch.  Diff mode
+also provides the following commands to navigate, manipulate and apply
+parts of patches:
+
+@table @kbd
+@item M-n
+Move to the next hunk-start (@code{diff-hunk-next}).
+
+@item M-p
+Move to the previous hunk-start (@code{diff-hunk-prev}).
+
+@item M-@}
+Move to the next file-start, in a multi-file patch
+(@code{diff-file-next}).
+
+@item M-@{
+Move to the previous file-start, in a multi-file patch
+(@code{diff-file-prev}).
+
+@item M-k
+Kill the hunk at point (@code{diff-hunk-kill}).
+
+@item M-K
+In a multi-file patch, kill the current file part.
+(@code{diff-file-kill}).
+
+@item C-c C-a
+Apply this hunk to its target file (@code{diff-apply-hunk}).  With a
+prefix argument of @kbd{C-u}, revert this hunk.
+
+@item C-c C-c
+Go to the source corresponding to this hunk (@code{diff-goto-source}).
+
+@item C-c C-e
+Start an Ediff session with the patch (@code{diff-ediff-patch}).
+@xref{Top, Ediff, Ediff, ediff, The Ediff Manual}.
+
+@item C-c C-n
+Restrict the view to the current hunk (@code{diff-restrict-view}).
+@xref{Narrowing}.  With a prefix argument of @kbd{C-u}, restrict the
+view to the current patch of a multiple file patch.  To widen again,
+use @kbd{C-x n w}.
+
+@item C-c C-r
+Reverse the direction of comparison for the entire buffer
+(@code{diff-reverse-direction}).
+
+@item C-c C-s
+Split the hunk at point (@code{diff-split-hunk}).  This is for
+manually editing patches, and only works with the unified diff format.
+
+@item C-c C-u
+Convert the entire buffer to unified format
+(@code{diff-context->unified}).  With a prefix argument, convert
+unified format to context format.  In Transient Mark mode, when the
+mark is active, this command operates only on the region.
+
+@item C-c C-w
+Refine the current hunk so that it disregards changes in whitespace
+(@code{diff-refine-hunk}).
+@end table
+
+  @kbd{C-x 4 a} in Diff mode operates on behalf of the target file,
+but gets the function name from the patch itself.  @xref{Change Log}.
+This is useful for making log entries for functions that are deleted
+by the patch.
+
+@node Two-Column, Editing Binary Files, Diff Mode, Top
 @section Two-Column Editing
 @cindex two-column editing
 @cindex splitting columns