Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-14

Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 58-65)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 22-28)

   - Update from CVS
   - Merge from emacs--devo--0
   - Update from CVS: lisp/gnus.el: Remove bogus comment.

5 files changed, 118 insertions, 30 deletions

diff --git a/man/ChangeLog b/man/ChangeLog
index edd9592722c..e48374ce6d4 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,25 @@
+2006-02-10  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macos.texi (Mac International): Rename "fontset-mac" to
+        "fontset-standard".
+
+2006-02-09  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * gnus.texi (Gnus Versions): Add history beyond start of Oort.
+
+2006-02-09  Mathias Dahl  <mathias.dah@gmail.com>
+
+        * dired.texi (Tumme): Basic documentation for Tumme added.
+
+2006-02-08  Romain Francoise  <romain@orebokech.com>
+
+        * faq.texi (Top): Remove paragraph about the FAQ being a
+        transitional document, etc.
+        (Searching for/replacing newlines): New node.
+        (Yanking text in isearch): New node.
+        (Inserting text at the beginning of each line): Rename and make
+        more general, mention `M-;' in Message mode.
+
 2006-02-07  Luc Teirlinck  <teirllm@auburn.edu>
 
         * mule.texi (International):
diff --git a/man/dired.texi b/man/dired.texi
index a432d681918..be733f9924d 100644
--- a/man/dired.texi
+++ b/man/dired.texi
@@ -40,6 +40,8 @@ files.
 * Updating: Dired Updating.   Discarding lines for files of no interest.
 * Find: Dired and Find.       Using `find' to choose the files for Dired.
 * Wdired::                    Operating on files by editing the Dired buffer.
+* Tumme::                     Image file and thumbnail viewing and 
+                              manipulation from the Dired buffer.
 * Misc: Misc Dired Features.  Various other features.
 @end menu
 
@@ -1140,6 +1142,52 @@ you can change @samp{-rw-r--r--} to @samp{-rw-rw-rw-} to make a file
 world-writable.  These changes also take effect when you type @kbd{C-c
 C-c}.
 
+@node Tumme
+@section Thumbnail and image file viewing and manipulation
+
+@cindex tumme mode
+  Tumme provides for simple viewing of thumbnails if image files.  It
+also provides viewing of the original file, sized or in full size,
+inside Emacs or in an external viewer.  
+
+  Tumme aims to be both easy to use for a beginner but also powerful
+and useful for an experienced user.
+
+  To try out Tumme, mark some image files in Dired and type @kbd{C-t
+d} (@code{tumme-display-thumbs}).  With point in the thumbnail buffer,
+type @kbd{RET} (@code{tumme-display-thumbnail-original-image}) to
+display a sized version of it.  Use the keys to move around in the
+buffer.  For easy browing, type @kbd{SPC}
+(@code{tumme-display-next-thumbnail-original}) to advance and display
+the next image.  Typing @kbd{SPC}
+(@code{tumme-display-previous-thumbnail-original}) backs up to the
+previous thumbnail and displays the image.
+
+  If you want to see the image in its original size, either provide a
+prefix argument (@kbd{C-u}) before pressing @kbd{RET}, or type
+@kbd{C-return} (@code{tumme-thumbnail-display-external}) to display
+the image in an external viewer.
+
+  If you find in image that you want to delete, type @kbd{d}
+(@code{tumme-flag-thumb-original-file}) and the file will be flagged
+for deletion in the dired buffer.  If you just want to delete the
+thumbnail image from the thumbnail buffer, type @kbd{C-d}
+(@code{tumme-delete-char}).
+
+  More advanced features include commands for using ``tags'' (labels,
+or categories) to tag image files and to search for image files with a
+certain tag.
+
+  The tags put on image files are stored in a database file and can be
+used for marking image files.  For example, you can let Tumme mark all
+files in the current directory tagged with the tag `flowers'.  To tag
+image files, mark them in the dired buffer and type @kbd{C-t t}
+(@code{tumme-tag-files}).  To mark files having a certain tag, type
+@kbd{C-t f} (@code{tumme-mark-tagged-files}).
+
+  Tumme also provide simple image manipulation commands, like rotating
+thumbnails and original image files.
+
 @node Misc Dired Features
 @section Other Dired Features
 
diff --git a/man/faq.texi b/man/faq.texi
index 77955d9c1ce..734212758d5 100644
--- a/man/faq.texi
+++ b/man/faq.texi
@@ -59,12 +59,9 @@ distribution.]
 
 This is the GNU Emacs FAQ, last updated on @today{}.
 
-The FAQ is maintained as a Texinfo document, allowing us to create HTML,
-Info, and TeX documents from a single source file, and is slowly but
-surely being improved.  Please bear with us as we improve on this
-format.  This FAQ is maintained as a part of GNU Emacs.  If you find
-any errors, or have any suggestions, please use @kbd{M-x report-emacs-bug}
-to report them.
+This FAQ is maintained as a part of GNU Emacs.  If you find any errors,
+or have any suggestions, please use @kbd{M-x report-emacs-bug} to report
+them.
 
 @menu
 * FAQ notation::
@@ -1177,6 +1174,8 @@ In addition, Emacs 22 now includes the Emacs Lisp Reference Manual
 * Highlighting a region::
 * Controlling case sensitivity::
 * Wrapping words automatically::
+* Searching for/replacing newlines::
+* Yanking text in isearch::
 * Spell-checkers::
 * Checking TeX and *roff documents::
 * Changing load-path::
@@ -1195,7 +1194,7 @@ In addition, Emacs 22 now includes the Emacs Lisp Reference Manual
 * Valid X resources::
 * Evaluating Emacs Lisp code::
 * Changing the length of a Tab::
-* Inserting > at the beginning of each line::
+* Inserting text at the beginning of each line::
 * Underlining paragraphs::
 * Repeating a command as many times as possible::
 * Forcing the cursor to remain in the same column::
@@ -1534,7 +1533,7 @@ including
 in your @file{.emacs} file.  (Also see @ref{Turning on syntax
 highlighting}.)
 
-@node Controlling case sensitivity, Wrapping words automatically, Highlighting a region, Common requests
+@node Controlling case sensitivity, Searching for/replacing newlines, Highlighting a region, Common requests
 @section How do I control Emacs's case-sensitivity when searching/replacing?
 @cindex @code{case-fold-search}
 @cindex Case sensitivity of searches
@@ -1566,7 +1565,23 @@ mode's hook.  For example:
            (setq case-fold-search nil)))
 @end lisp
 
-@node Wrapping words automatically, Spell-checkers, Controlling case sensitivity, Common requests
+@node Searching for/replacing newlines, Yanking text in isearch, Controlling case sensitivity, Common requests
+@section How do I input a newline character in isearch or query-replace?
+@cindex Searching for newlines
+@cindex Replacing newlines
+
+Use @kbd{C-q C-j}.  For more information, see @inforef{Special Isearch,
+Special Input for Incremental Search, emacs}.
+
+
+@node Yanking text in isearch, Wrapping words automatically, Searching for/replacing newlines, Common requests
+@section How do I copy text from the kill ring into the search string?
+@cindex Yanking text into the search string
+@cindex isearch yanking
+
+Use @kbd{M-y}.  @inforef{Isearch Yank, Isearch Yanking, emacs}.
+
+@node Wrapping words automatically, Spell-checkers, Yanking text in isearch, Common requests
 @section How do I make Emacs wrap words for me?
 @cindex Wrapping word automatically
 @cindex Wrapping lines
@@ -2102,7 +2117,7 @@ about them.
 
 @end itemize
 
-@node Changing the length of a Tab, Inserting > at the beginning of each line, Evaluating Emacs Lisp code, Common requests
+@node Changing the length of a Tab, Inserting text at the beginning of each line, Evaluating Emacs Lisp code, Common requests
 @section How do I change Emacs's idea of the @key{TAB} character's length?
 @cindex Tab length
 @cindex Length of tab character
@@ -2121,8 +2136,9 @@ Do not confuse variable @code{tab-width} with variable
 @key{TAB} characters.  The latter controls what characters are inserted
 when you press the @key{TAB} character in certain modes.
 
-@node Inserting > at the beginning of each line, Underlining paragraphs, Changing the length of a Tab, Common requests
-@section How do I insert @samp{>} at the beginning of every line?
+@node Inserting text at the beginning of each line, Underlining paragraphs, Changing the length of a Tab, Common requests
+@section How do I insert <some text> at the beginning of every line?
+@cindex Prefixing a region with some text
 @cindex Prefix character, inserting in mail/news replies
 @cindex Replies to mail/news, inserting a prefix character
 @cindex @code{mail-yank-prefix}
@@ -2130,7 +2146,7 @@ when you press the @key{TAB} character in certain modes.
 @cindex News replies, inserting a prefix character
 
 To do this to an entire buffer, type @kbd{M-< M-x replace-regexp
-@key{RET} ^ @key{RET} > @key{RET}}.
+@key{RET} ^ @key{RET} your text @key{RET}}.
 
 To do this to a region, use @code{string-insert-rectangle}.
 Set the mark (@kbd{C-@key{SPC}}) at the beginning of the first line you
@@ -2139,13 +2155,12 @@ want to prefix, move the cursor to last line to be prefixed, and type
 buffer, type @kbd{C-x h M-x string-insert-rectangle @key{RET}}.
 
 If you are trying to prefix a yanked mail message with @samp{>}, you
-might want to set the variable @code{mail-yank-prefix}.  Better yet, use
-the Supercite package (@pxref{Supercite}), which provides flexible
-citation for yanked mail and news messages; it is included in Emacs
-since version 19.20.  @xref{Changing the included text prefix}, for
-additional information.
+might want to set the variable @code{mail-yank-prefix}.  In Message
+buffers, you can even use @kbd{M-;} to cite yanked messages (@kbd{M-;}
+runs the function @code{comment-region}, it is a general-purpose
+mechanism to comment regions).
 
-@node Underlining paragraphs, Repeating a command as many times as possible, Inserting > at the beginning of each line, Common requests
+@node Underlining paragraphs, Repeating a command as many times as possible, Inserting text at the beginning of each line, Common requests
 @section How do I insert @samp{_^H} before each character in a region to get an underlined paragraph?
 @cindex Underlining a region of text
 @cindex @code{underline-region}
diff --git a/man/gnus.texi b/man/gnus.texi
index 8fe7355a4c8..bdfe5ab2194 100644
--- a/man/gnus.texi
+++ b/man/gnus.texi
@@ -24547,14 +24547,17 @@ Gnus 5.6 begat Pterodactyl Gnus on August 29th 1998 and was released as
 ``Gnus 5.8'' (after 99 releases and a CVS repository) on December 3rd
 1999.
 
-On the 26th of October 2000, Oort Gnus was begun.
+On the 26th of October 2000, Oort Gnus was begun and was released as
+Gnus 5.10 on May 1st 2003 (24 releases).
+
+On the January 4th 2004, No Gnus was begun.
 
 If you happen upon a version of Gnus that has a prefixed name --
 ``(ding) Gnus'', ``September Gnus'', ``Red Gnus'', ``Quassia Gnus'',
-``Pterodactyl Gnus'', ``Oort Gnus'' -- don't panic.  Don't let it know
-that you're frightened.  Back away.  Slowly.  Whatever you do, don't
-run.  Walk away, calmly, until you're out of its reach.  Find a proper
-released version of Gnus and snuggle up to that instead.
+``Pterodactyl Gnus'', ``Oort Gnus'', ``No Gnus'' -- don't panic.
+Don't let it know that you're frightened.  Back away.  Slowly.  Whatever
+you do, don't run.  Walk away, calmly, until you're out of its reach.
+Find a proper released version of Gnus and snuggle up to that instead.
 
 
 @node Other Gnus Versions
diff --git a/man/macos.texi b/man/macos.texi
index 76a11ea92e7..ba0f9e995ca 100644
--- a/man/macos.texi
+++ b/man/macos.texi
@@ -104,12 +104,12 @@ 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-mac} 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}).
+  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