Merge from emacs-23; up to r100491

67 files changed, 252 insertions, 76 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 3e0c1bb47b0..d7c678f270d 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2011-02-19  Glenn Morris  <rgm@gnu.org>
+
+	* dired.texi (Dired): Dired-X version number was dropped.
+
 2011-02-14  Jan Djärv  <jan.h.d@swipnet.se>
 
 	* xresources.texi (X Resources): Remove *faceName and replace it with
diff --git a/doc/emacs/dired.texi b/doc/emacs/dired.texi
index 914c9984c14..2f274d7a324 100644
--- a/doc/emacs/dired.texi
+++ b/doc/emacs/dired.texi
@@ -23,7 +23,7 @@ files.  You first mark certain files in order to operate on all of
 them with one command.
 
   The Dired-X package provides various extra features for Dired mode.
-@xref{Top, Dired-X,,dired-x, Dired Extra Version 2 User's Manual}.
+@xref{Top, Dired-X,,dired-x, Dired Extra User's Manual}.
 
   You can also view a list of files in a directory with @kbd{C-x C-d}
 (@code{list-directory}).  Unlike Dired, this command does not allow
diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index a6897fc4ec9..d2e6954025a 100644
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -1,3 +1,7 @@
+2011-02-19  Eli Zaretskii  <eliz@gnu.org>
+
+	* emacs-lisp-intro.texi: Sync @dircategory with ../../info/dir.
+
 2011-01-23  Werner Lemberg  <wl@gnu.org>
 
 	* Makefile.in (MAKEINFO): Now controlled by `configure'.
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index 7b9ec75446b..11ceea19eef 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -216,7 +216,7 @@
 
 @c ----------------------------------------------------
 
-@dircategory Emacs
+@dircategory GNU Emacs Lisp
 @direntry
 * Emacs Lisp Intro: (eintr).
                           A simple introduction to Emacs Lisp programming.
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index b9fc72491a3..c48173bbbdb 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,23 @@
+2011-02-19  Eli Zaretskii  <eliz@gnu.org>
+
+	* elisp.texi: Sync @dircategory with ../../info/dir.
+
+	* files.texi (Visiting Functions): Document find-file-literally,
+	both the command and the variable.
+
+	* variables.texi (Creating Buffer-Local): Explain the meaning of
+	permanent local variables.
+
+	* files.texi (Visiting Functions): Document find-file-literally,
+	both the command and the variable.
+
+	* variables.texi (Creating Buffer-Local): Explain the meaning of
+	permanent local variables.
+
+2011-02-19  Glenn Morris  <rgm@gnu.org>
+
+	* keymaps.texi (Remapping Commands): Mention how to undo it.
+
 2011-02-09  Reuben Thomas  <rrt@sc3d.org>
 
 	* loading.texi (Hooks for Loading): Remove unnecessary advice
diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi
index ad7931d45b4..cc3ceb8003c 100644
--- a/doc/lispref/elisp.texi
+++ b/doc/lispref/elisp.texi
@@ -62,7 +62,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory GNU Emacs Lisp
 @direntry
 * Elisp: (elisp).       The Emacs Lisp Reference Manual.
 @end direntry
diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi
index 46ebced7a32..3697f18badd 100644
--- a/doc/lispref/files.texi
+++ b/doc/lispref/files.texi
@@ -113,6 +113,26 @@ When @code{find-file} is called interactively, it prompts for
 @var{filename} in the minibuffer.
 @end deffn
 
+@deffn Command find-file-literally filename
+This command visits @var{filename}, like @code{find-file} does, but it
+does not perform any format conversions (@pxref{Format Conversion}),
+character code conversions (@pxref{Coding Systems}), or end-of-line
+conversions (@pxref{Coding System Basics, End of line conversion}).
+The buffer visiting the file is made unibyte, and its major mode is
+Fundamental mode, regardless of the file name.  File local variable
+specifications  in the file (@pxref{File Local Variables}) are
+ignored, and automatic decompression and adding a newline at the end
+of the file due to @code{require-final-newline} (@pxref{Saving
+Buffers, require-final-newline}) are also disabled.
+
+Note that if Emacs already has a buffer visiting the same file
+non-literally, it will not visit the same file literally, but instead
+just switch to the existing buffer.  If you want to be sure of
+accessing a file's contents literally, you should create a temporary
+buffer and then read the file contents into it using
+@code{insert-file-contents-literally} (@pxref{Reading from Files}).
+@end deffn
+
 @defun find-file-noselect filename &optional nowarn rawfile wildcards
 This function is the guts of all the file-visiting functions.  It
 returns a buffer visiting the file @var{filename}.  You may make the
@@ -224,6 +244,16 @@ This is not a normal hook because the values of the functions are
 used, and in many cases only some of the functions are called.
 @end defvar
 
+@defvar find-file-literally
+This buffer-local variable, if set to a non-@code{nil} value, makes
+@code{save-buffer} behave as if the buffer were visiting its file
+literally, i.e. without conversions of any kind.  The command
+@code{find-file-literally} sets this variable's local value, but other
+equivalent functions and commands can do that as well, e.g.@: to avoid
+automatic addition of a newline at the end of the file.  This variable
+us permanent local, so it is unaffected by changes of major modes.
+@end defvar
+
 @node Subroutines of Visiting
 @comment  node-name,  next,  previous,  up
 @subsection Subroutines of Visiting
diff --git a/doc/lispref/keymaps.texi b/doc/lispref/keymaps.texi
index 4a2964b9b6c..af24ff5aa43 100644
--- a/doc/lispref/keymaps.texi
+++ b/doc/lispref/keymaps.texi
@@ -1508,6 +1508,12 @@ does not have the effect of remapping @code{kill-line} into
 if an ordinary binding specifies @code{my-kill-line}, this keymap will
 remap it to @code{my-other-kill-line}.
 
+To undo the remapping of a command, remap it to @code{nil}; e.g.
+
+@smallexample
+(define-key my-mode-map [remap kill-line] nil)
+@end smallexample
+
 @defun command-remapping command &optional position keymaps
 This function returns the remapping for @var{command} (a symbol),
 given the current active keymaps.  If @var{command} is not remapped
diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi
index 5b5f3365978..0cdcaa84d58 100644
--- a/doc/lispref/variables.texi
+++ b/doc/lispref/variables.texi
@@ -1407,6 +1407,8 @@ subsequent major mode.  @xref{Hooks}.
 @cindex permanent local variable
 A buffer-local variable is @dfn{permanent} if the variable name (a
 symbol) has a @code{permanent-local} property that is non-@code{nil}.
+Such variables are unaffected by @code{kill-all-local-variables}, and
+their local bindings are therefore not cleared by changing major modes.
 Permanent locals are appropriate for data pertaining to where the file
 came from or how to save it, rather than with how to edit the contents.
 
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index a113577852d..d91967e07a9 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,53 @@
+2011-02-19  Eli Zaretskii  <eliz@gnu.org>
+
+	* ada-mode.texi: Sync @dircategory with ../../info/dir.
+	* auth.texi: Sync @dircategory with ../../info/dir.
+	* autotype.texi: Sync @dircategory with ../../info/dir.
+	* calc.texi: Sync @dircategory with ../../info/dir.
+	* cc-mode.texi: Sync @dircategory with ../../info/dir.
+	* cl.texi: Sync @dircategory with ../../info/dir.
+	* dbus.texi: Sync @dircategory with ../../info/dir.
+	* dired-x.texi: Sync @dircategory with ../../info/dir.
+	* ebrowse.texi: Sync @dircategory with ../../info/dir.
+	* ede.texi: Sync @dircategory with ../../info/dir.
+	* ediff.texi: Sync @dircategory with ../../info/dir.
+	* edt.texi: Sync @dircategory with ../../info/dir.
+	* eieio.texi: Sync @dircategory with ../../info/dir.
+	* emacs-mime.texi: Sync @dircategory with ../../info/dir.
+	* epa.texi: Sync @dircategory with ../../info/dir.
+	* erc.texi: Sync @dircategory with ../../info/dir.
+	* eshell.texi: Sync @dircategory with ../../info/dir.
+	* eudc.texi: Sync @dircategory with ../../info/dir.
+	* flymake.texi: Sync @dircategory with ../../info/dir.
+	* forms.texi: Sync @dircategory with ../../info/dir.
+	* gnus.texi: Sync @dircategory with ../../info/dir.
+	* idlwave.texi: Sync @dircategory with ../../info/dir.
+	* mairix-el.texi: Sync @dircategory with ../../info/dir.
+	* message.texi: Sync @dircategory with ../../info/dir.
+	* mh-e.texi: Sync @dircategory with ../../info/dir.
+	* newsticker.texi: Sync @dircategory with ../../info/dir.
+	* nxml-mode.texi: Sync @dircategory with ../../info/dir.
+	* org.texi: Sync @dircategory with ../../info/dir.
+	* pcl-cvs.texi: Sync @dircategory with ../../info/dir.
+	* pgg.texi: Sync @dircategory with ../../info/dir.
+	* rcirc.texi: Sync @dircategory with ../../info/dir.
+	* reftex.texi: Sync @dircategory with ../../info/dir.
+	* remember.texi: Sync @dircategory with ../../info/dir.
+	* sasl.texi: Sync @dircategory with ../../info/dir.
+	* sc.texi: Sync @dircategory with ../../info/dir.
+	* semantic.texi: Sync @dircategory with ../../info/dir.
+	* ses.texi: Sync @dircategory with ../../info/dir.
+	* sieve.texi: Sync @dircategory with ../../info/dir.
+	* smtpmail.texi: Sync @dircategory with ../../info/dir.
+	* speedbar.texi: Sync @dircategory with ../../info/dir.
+	* trampver.texi [emacs]: Set emacsname to "Emacs".
+	* tramp.texi: Sync @dircategory with ../../info/dir.
+	* url.texi: Sync @dircategory with ../../info/dir.
+	* vip.texi: Sync @dircategory with ../../info/dir.
+	* viper.texi: Sync @dircategory with ../../info/dir.
+	* widget.texi: Sync @dircategory with ../../info/dir.
+	* woman.texi: Sync @dircategory with ../../info/dir.
+
 2011-02-19  Glenn Morris  <rgm@gnu.org>
 
 	* dired-x.texi (Technical Details): No longer redefines dired-add-entry,
diff --git a/doc/misc/ada-mode.texi b/doc/misc/ada-mode.texi
index 4be88b40361..66cdb200111 100644
--- a/doc/misc/ada-mode.texi
+++ b/doc/misc/ada-mode.texi
@@ -19,7 +19,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs editing modes
 @direntry
 * Ada mode: (ada-mode).         Emacs mode for editing and compiling Ada code.
 @end direntry
diff --git a/doc/misc/auth.texi b/doc/misc/auth.texi
index 67f5b52b694..27c6691dfa8 100644
--- a/doc/misc/auth.texi
+++ b/doc/misc/auth.texi
@@ -32,7 +32,7 @@ license to the document, as described in section 6 of the license.
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs lisp libraries
 @direntry
 * Auth-source: (auth).          The Emacs auth-source library.
 @end direntry
diff --git a/doc/misc/autotype.texi b/doc/misc/autotype.texi
index bdf9ae7ab17..2e66c78a3cb 100644
--- a/doc/misc/autotype.texi
+++ b/doc/misc/autotype.texi
@@ -26,7 +26,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs misc features
 @direntry
 * Autotype: (autotype).         Convenient features for text that you
                                   enter frequently in Emacs.
diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi
index e98ea807f63..b9d4f8c4a23 100644
--- a/doc/misc/calc.texi
+++ b/doc/misc/calc.texi
@@ -111,7 +111,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs misc features
 @direntry
 * Calc: (calc).                 Advanced desk calculator and mathematical tool.
 @end direntry
diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi
index d4a870346ce..9ae9abd5e1a 100644
--- a/doc/misc/cc-mode.texi
+++ b/doc/misc/cc-mode.texi
@@ -177,7 +177,7 @@ developing GNU and promoting software freedom.''
 
 @comment Info directory entry for use by install-info. The indentation
 @comment here is by request from the FSF folks.
-@dircategory Emacs
+@dircategory Emacs editing modes
 @direntry
 * CC Mode: (ccmode).            Emacs mode for editing C, C++, Objective-C,
                                 Java, Pike, AWK, and CORBA IDL code.
diff --git a/doc/misc/cl.texi b/doc/misc/cl.texi
index 13fe9b570e2..afe7c94f447 100644
--- a/doc/misc/cl.texi
+++ b/doc/misc/cl.texi
@@ -21,7 +21,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs lisp libraries
 @direntry
 * CL: (cl).                     Partial Common Lisp support for Emacs Lisp.
 @end direntry
diff --git a/doc/misc/dbus.texi b/doc/misc/dbus.texi
index 64d577f4387..ad202f963aa 100644
--- a/doc/misc/dbus.texi
+++ b/doc/misc/dbus.texi
@@ -25,7 +25,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs lisp libraries
 @direntry
 * D-Bus: (dbus).                Using D-Bus in Emacs.
 @end direntry
diff --git a/doc/misc/dired-x.texi b/doc/misc/dired-x.texi
index 4a542d9841b..c4e474f0943 100644
--- a/doc/misc/dired-x.texi
+++ b/doc/misc/dired-x.texi
@@ -36,7 +36,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs misc features
 @direntry
 * Dired-X: (dired-x).           Dired Extra Features.
 @end direntry
diff --git a/doc/misc/ebrowse.texi b/doc/misc/ebrowse.texi
index 81a1ab0d29d..19ee9705484 100644
--- a/doc/misc/ebrowse.texi
+++ b/doc/misc/ebrowse.texi
@@ -26,7 +26,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs misc features
 @direntry
 * Ebrowse: (ebrowse).           A C++ class browser for Emacs.
 @end direntry
diff --git a/doc/misc/ede.texi b/doc/misc/ede.texi
index 86228a24d06..bc097a87150 100644
--- a/doc/misc/ede.texi
+++ b/doc/misc/ede.texi
@@ -21,9 +21,9 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs misc features
 @direntry
-* ede: (ede).                   Project management for Emacs.
+* EDE: (ede).                   The Emacs Development Environment.
 @end direntry
 
 @titlepage
diff --git a/doc/misc/ediff.texi b/doc/misc/ediff.texi
index 743a3460f9b..3ba0796e636 100644
--- a/doc/misc/ediff.texi
+++ b/doc/misc/ediff.texi
@@ -41,7 +41,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs misc features
 @direntry
 * Ediff: (ediff).       A visual interface for comparing and merging programs.
 @end direntry
diff --git a/doc/misc/edt.texi b/doc/misc/edt.texi
index e3117d65699..377bb6ee8c5 100644
--- a/doc/misc/edt.texi
+++ b/doc/misc/edt.texi
@@ -22,7 +22,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs misc features
 @direntry
 * EDT: (edt).                   An Emacs emulation of the EDT editor.
 @end direntry
diff --git a/doc/misc/eieio.texi b/doc/misc/eieio.texi
index 1a22a15afba..8ee40288fe0 100644
--- a/doc/misc/eieio.texi
+++ b/doc/misc/eieio.texi
@@ -27,9 +27,9 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs misc features
 @direntry
-* eieio: (eieio).               Objects for Emacs.
+* EIEIO: (eieio).               An objects system for Emacs Lisp.
 @end direntry
 
 @titlepage
diff --git a/doc/misc/emacs-mime.texi b/doc/misc/emacs-mime.texi
index ef6db1c3606..a9d80d868b6 100644
--- a/doc/misc/emacs-mime.texi
+++ b/doc/misc/emacs-mime.texi
@@ -30,7 +30,7 @@ developing GNU and promoting software freedom.''
 @c Node ``Interface Functions'' uses Latin-1 characters
 @documentencoding ISO-8859-1
 
-@dircategory Emacs
+@dircategory Emacs lisp libraries
 @direntry
 * Emacs MIME: (emacs-mime).     Emacs MIME de/composition library.
 @end direntry
diff --git a/doc/misc/epa.texi b/doc/misc/epa.texi
index ae194356c3f..b4137a7dac6 100644
--- a/doc/misc/epa.texi
+++ b/doc/misc/epa.texi
@@ -31,7 +31,7 @@ license to the document, as described in section 6 of the license.
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs misc features
 @direntry
 * EasyPG Assistant: (epa).      An Emacs user interface to GNU Privacy Guard.
 @end direntry
diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi
index 1ce6e949da5..463a14f08d2 100644
--- a/doc/misc/erc.texi
+++ b/doc/misc/erc.texi
@@ -28,7 +28,7 @@ and modified without restriction.
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs network features
 @direntry
 * ERC: (erc).                   Powerful and extensible IRC client for Emacs.
 @end direntry
diff --git a/doc/misc/eshell.texi b/doc/misc/eshell.texi
index 51031e219ff..0ae6a0e7fae 100644
--- a/doc/misc/eshell.texi
+++ b/doc/misc/eshell.texi
@@ -24,7 +24,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs misc features
 @direntry
 * Eshell: (eshell).             A command shell implemented in Emacs Lisp.
 @end direntry
diff --git a/doc/misc/eudc.texi b/doc/misc/eudc.texi
index e21abcdb137..a68eda50025 100644
--- a/doc/misc/eudc.texi
+++ b/doc/misc/eudc.texi
@@ -28,7 +28,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs network features
 @direntry
 * EUDC: (eudc).                 Emacs client for directory servers (LDAP, PH).
 @end direntry
diff --git a/doc/misc/flymake.texi b/doc/misc/flymake.texi
index 7f0cd77de59..74cf3d630da 100644
--- a/doc/misc/flymake.texi
+++ b/doc/misc/flymake.texi
@@ -28,7 +28,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs misc features
 @direntry
 * Flymake: (flymake).           A universal on-the-fly syntax checker.
 @end direntry
diff --git a/doc/misc/forms.texi b/doc/misc/forms.texi
index f58e8d8f969..17c1d7feaf0 100644
--- a/doc/misc/forms.texi
+++ b/doc/misc/forms.texi
@@ -34,7 +34,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs misc features
 @direntry
 * Forms: (forms).               Emacs package for editing data bases
                                   by filling in forms.
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 16273d21c46..5aa66deb946 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -321,7 +321,7 @@ developing GNU and promoting software freedom.''
 @end iflatex
 @end iftex
 
-@dircategory Emacs
+@dircategory Emacs network features
 @direntry
 * Gnus: (gnus).                 The newsreader Gnus.
 @end direntry
diff --git a/doc/misc/idlwave.texi b/doc/misc/idlwave.texi
index 98da23768ec..94aeb612df7 100644
--- a/doc/misc/idlwave.texi
+++ b/doc/misc/idlwave.texi
@@ -38,7 +38,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs editing modes
 @direntry
 * IDLWAVE: (idlwave).           Major mode and shell for IDL files.
 @end direntry
diff --git a/doc/misc/mairix-el.texi b/doc/misc/mairix-el.texi
index 4235e825fb6..d64f316cb7b 100644
--- a/doc/misc/mairix-el.texi
+++ b/doc/misc/mairix-el.texi
@@ -22,7 +22,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs network features
 @direntry
 * Mairix: (mairix-el).          Emacs interface to the Mairix mail indexer.
 @end direntry
diff --git a/doc/misc/message.texi b/doc/misc/message.texi
index 4f0c09f4117..b28639907ed 100644
--- a/doc/misc/message.texi
+++ b/doc/misc/message.texi
@@ -26,7 +26,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs network features
 @direntry
 * Message: (message).           Mail and news composition mode that
                                   goes with Gnus.
diff --git a/doc/misc/mh-e.texi b/doc/misc/mh-e.texi
index 546f9e629fe..59da631c6ea 100644
--- a/doc/misc/mh-e.texi
+++ b/doc/misc/mh-e.texi
@@ -55,7 +55,7 @@ Public License.''
 @end copying
 
 @c Info Directory Entry
-@dircategory Emacs
+@dircategory Emacs network features
 @direntry
 * MH-E: (mh-e).                 Emacs interface to the MH mail system.
 @end direntry
diff --git a/doc/misc/newsticker.texi b/doc/misc/newsticker.texi
index fadcf1ea17b..c7d82245973 100644
--- a/doc/misc/newsticker.texi
+++ b/doc/misc/newsticker.texi
@@ -30,7 +30,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs network features
 @direntry
 * Newsticker: (newsticker).     A Newsticker for Emacs.
 @end direntry
diff --git a/doc/misc/nxml-mode.texi b/doc/misc/nxml-mode.texi
index b2003a139d0..27603440413 100644
--- a/doc/misc/nxml-mode.texi
+++ b/doc/misc/nxml-mode.texi
@@ -31,7 +31,7 @@ license to the document, as described in section 6 of the license.
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs editing modes
 @direntry
 * nXML Mode: (nxml-mode).       XML editing mode with RELAX NG support.
 @end direntry
diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index 7618bad1f73..a0ec20c4034 100644
--- a/doc/misc/org.texi
+++ b/doc/misc/org.texi
@@ -286,7 +286,7 @@ license to the document, as described in section 6 of the license.
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs editing modes
 @direntry
 * Org Mode: (org).      Outline-based notes management and organizer
 @end direntry
diff --git a/doc/misc/pcl-cvs.texi b/doc/misc/pcl-cvs.texi
index 7301bf3747a..f12942da2d3 100644
--- a/doc/misc/pcl-cvs.texi
+++ b/doc/misc/pcl-cvs.texi
@@ -23,7 +23,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs misc features
 @direntry
 * PCL-CVS: (pcl-cvs).           Emacs front-end to CVS.
 @end direntry
diff --git a/doc/misc/pgg.texi b/doc/misc/pgg.texi
index 6efa3e6bb72..9cb7a637a05 100644
--- a/doc/misc/pgg.texi
+++ b/doc/misc/pgg.texi
@@ -27,7 +27,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs network features
 @direntry
 * PGG: (pgg).                   Emacs interface to various PGP implementations.
 @end direntry
diff --git a/doc/misc/rcirc.texi b/doc/misc/rcirc.texi
index 6402c91c57a..c2b6867c419 100644
--- a/doc/misc/rcirc.texi
+++ b/doc/misc/rcirc.texi
@@ -22,7 +22,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs network features
 @direntry
 * Rcirc: (rcirc).               Internet Relay Chat (IRC) client.
 @end direntry
diff --git a/doc/misc/reftex.texi b/doc/misc/reftex.texi
index 8c1ab92032f..3944b712338 100644
--- a/doc/misc/reftex.texi
+++ b/doc/misc/reftex.texi
@@ -43,7 +43,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs misc features
 @direntry
 * RefTeX: (reftex).             Emacs support for LaTeX cross-references
                                   and citations.
diff --git a/doc/misc/remember.texi b/doc/misc/remember.texi
index cdb45140093..e67d6155bbe 100644
--- a/doc/misc/remember.texi
+++ b/doc/misc/remember.texi
@@ -25,7 +25,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs misc features
 @direntry
 * Remember: (remember).         Simple information manager for Emacs.
 @end direntry
diff --git a/doc/misc/sasl.texi b/doc/misc/sasl.texi
index ec33f0525d3..a75b237519c 100644
--- a/doc/misc/sasl.texi
+++ b/doc/misc/sasl.texi
@@ -33,7 +33,7 @@ license to the document, as described in section 6 of the license.
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs network features
 @direntry
 * SASL: (sasl).                 The Emacs SASL library.
 @end direntry
diff --git a/doc/misc/sc.texi b/doc/misc/sc.texi
index fbeadb6a522..8853192af04 100644
--- a/doc/misc/sc.texi
+++ b/doc/misc/sc.texi
@@ -32,7 +32,7 @@ developing GNU and promoting software freedom.''
 
 @c      @smallbook
 
-@dircategory Emacs
+@dircategory Emacs network features
 @direntry
 * SC: (sc).                     Supercite lets you cite parts of messages
                                   you're replying to, in flexible ways.
diff --git a/doc/misc/semantic.texi b/doc/misc/semantic.texi
index 89e83df5bc3..52434f4a6e4 100644
--- a/doc/misc/semantic.texi
+++ b/doc/misc/semantic.texi
@@ -40,7 +40,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs misc features
 @direntry
 * Semantic: (semantic).         Source code parser library and utilities.
 @end direntry
diff --git a/doc/misc/ses.texi b/doc/misc/ses.texi
index 45e5e9efc0e..d9739b93925 100644
--- a/doc/misc/ses.texi
+++ b/doc/misc/ses.texi
@@ -27,7 +27,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs misc features
 @direntry
 * SES: (ses).                   Simple Emacs Spreadsheet.
 @end direntry
diff --git a/doc/misc/sieve.texi b/doc/misc/sieve.texi
index 754ee15fecc..64fd92f40ca 100644
--- a/doc/misc/sieve.texi
+++ b/doc/misc/sieve.texi
@@ -27,7 +27,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs network features
 @direntry
 * Sieve: (sieve).               Managing Sieve scripts in Emacs.
 @end direntry
diff --git a/doc/misc/smtpmail.texi b/doc/misc/smtpmail.texi
index abd7d8974dc..1d4bbbff4ac 100644
--- a/doc/misc/smtpmail.texi
+++ b/doc/misc/smtpmail.texi
@@ -20,7 +20,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs lisp libraries
 @direntry
 * SMTP: (smtpmail).             Emacs library for sending mail via SMTP.
 @end direntry
diff --git a/doc/misc/speedbar.texi b/doc/misc/speedbar.texi
index 280438195b5..9dc47e4574c 100644
--- a/doc/misc/speedbar.texi
+++ b/doc/misc/speedbar.texi
@@ -20,7 +20,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs misc features
 @direntry
 * Speedbar: (speedbar).         File/Tag summarizing utility.
 @end direntry
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 994a8f99676..346354b3170 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -54,7 +54,7 @@ supports it in developing GNU and promoting software freedom.''
 @end copying
 
 @c Entries for @command{install-info} to use
-@dircategory @value{emacsname}
+@dircategory @value{emacsname} network features
 @direntry
 * TRAMP: (tramp).               Transparent Remote Access, Multiple Protocol
                                 @value{emacsname} remote file access via rsh and rcp.
diff --git a/doc/misc/trampver.texi b/doc/misc/trampver.texi
index 2968642bcc2..ff5641fb4b4 100644
--- a/doc/misc/trampver.texi
+++ b/doc/misc/trampver.texi
@@ -38,7 +38,7 @@
 
 @c Emacs values.
 @ifset emacs
-@set emacsname          GNU Emacs
+@set emacsname          Emacs
 @set emacsdir           emacs
 @set ftppackagename     Ange-FTP
 @set prefix             /
diff --git a/doc/misc/url.texi b/doc/misc/url.texi
index d337c82494c..2bde54a8dea 100644
--- a/doc/misc/url.texi
+++ b/doc/misc/url.texi
@@ -12,7 +12,7 @@
 \overfullrule=0pt
 %\global\baselineskip 30pt      % for printing in double space
 @end tex
-@dircategory Emacs
+@dircategory Emacs lisp libraries
 @direntry
 * URL: (url).                   URL loading package.
 @end direntry
diff --git a/doc/misc/vip.texi b/doc/misc/vip.texi
index fe1098c49ff..03ca65882e5 100644
--- a/doc/misc/vip.texi
+++ b/doc/misc/vip.texi
@@ -35,7 +35,7 @@ developing GNU and promoting software freedom.''
 @finalout
 @contents
 
-@dircategory Emacs
+@dircategory Emacs misc features
 @direntry
 * VIP: (vip).                   An older VI-emulation for Emacs.
 @end direntry
diff --git a/doc/misc/viper.texi b/doc/misc/viper.texi
index 9e55e08242f..1f0dffee5b4 100644
--- a/doc/misc/viper.texi
+++ b/doc/misc/viper.texi
@@ -23,7 +23,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs misc features
 @direntry
 * VIPER: (viper).               The newest Emacs VI-emulation mode.
                                   (also, A VI Plan for Emacs Rescue
diff --git a/doc/misc/widget.texi b/doc/misc/widget.texi
index 667dab55221..c4f5317e5a7 100644
--- a/doc/misc/widget.texi
+++ b/doc/misc/widget.texi
@@ -24,7 +24,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs lisp libraries
 @direntry
 * Widget: (widget).             The "widget" package used by the Emacs
                                   Customization facility.
diff --git a/doc/misc/woman.texi b/doc/misc/woman.texi
index 9f77a077703..c869d1a46c7 100644
--- a/doc/misc/woman.texi
+++ b/doc/misc/woman.texi
@@ -34,7 +34,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs misc features
 @direntry
 * WoMan: (woman).               Browse UN*X Manual Pages "W.O. (without) Man".
 @end direntry
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 65d04bb861e..193042c9f96 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,25 @@
+2011-02-19  Kenichi Handa  <handa@m17n.org>
+
+	* mail/rmailmm.el (rmail-mime-find-header-encoding): Be sure to
+	get the header copy into the temporary buffer.
+	(rmail-mime-insert-decoded-text): Ignore us-ascii.
+	(rmail-show-mime): When rmail-mime-coding-system is nil, set
+	buffer-file-coding-system to undecided.
+
+2011-02-19  Eli Zaretskii  <eliz@gnu.org>
+
+	* international/mule-cmds.el (read-char-by-name, ucs-insert):
+	Document completion with asterisk and a substring.
+
+2011-02-19  Glenn Morris  <rgm@gnu.org>
+
+	* files.el (find-file-literally): Doc fix.
+
+	* simple.el (rfc822-goto-eoh): Give it a doc-string.
+
+	* log-edit.el (log-edit-insert-changelog):
+	Fix `log-edit-strip-single-file-name' functionality.  (Bug#8057)
+
 2011-02-19  Glenn Morris  <rgm@gnu.org>
 
 	* dired-x.el (dired-read-shell-command): Merge into dired-aux's version.
diff --git a/lisp/files.el b/lisp/files.el
index fdbfe13b671..014469ed8fc 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2072,7 +2072,8 @@ Don't call it from programs!  Use `insert-file-contents-literally' instead.
 
 (defvar find-file-literally nil
   "Non-nil if this buffer was made by `find-file-literally' or equivalent.
-This is a permanent local.")
+This has the `permanent-local' property, which takes effect if you
+make the variable buffer-local.")
 (put 'find-file-literally 'permanent-local t)
 
 (defun find-file-literally (filename)
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 83ac617be08..abf59d06ed4 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,12 @@
+2011-02-19  Glenn Morris  <rgm@gnu.org>
+
+	* gnus.el (gnus-meta): Doc fix.
+
+2011-02-19  Chong Yidong  <cyd@stupidchicken.com>
+
+	* nnfolder.el (nnfolder-save-buffer): Don't let-bind copyright-update,
+	in case it's not yet loaded.
+
 2011-02-19  Lars Ingebrigtsen  <larsi@gnus.org>
 
 	* nnimap.el (nnimap-parse-copied-articles): Allow for "<foo> OK"
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index 4cbdee53ab4..42acb65ff9f 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -275,7 +275,7 @@
 
 (defgroup gnus-meta nil
   "Meta variables controlling major portions of Gnus.
-In general, modifying these variables does not take affect until Gnus
+In general, modifying these variables does not take effect until Gnus
 is restarted, and sometimes reloaded."
   :group 'gnus)
 
diff --git a/lisp/gnus/nnfolder.el b/lisp/gnus/nnfolder.el
index dd11ff71dd3..c6b4c0825e3 100644
--- a/lisp/gnus/nnfolder.el
+++ b/lisp/gnus/nnfolder.el
@@ -1090,8 +1090,8 @@ This command does not work if you use short group names."
     (gnus-make-directory (file-name-directory (buffer-file-name)))
     (let ((coding-system-for-write
 	   (or nnfolder-file-coding-system-for-write
-	       nnfolder-file-coding-system))
-	  (copyright-update nil))
+	       nnfolder-file-coding-system)))
+      (set (make-local-variable 'copyright-update) nil)
       (save-buffer)))
   (unless (or gnus-nov-is-evil nnfolder-nov-is-evil)
     (nnfolder-save-nov)))
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index d610da0aab6..8672fca3a85 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -2938,11 +2938,19 @@ on encoding."
 (defun read-char-by-name (prompt)
   "Read a character by its Unicode name or hex number string.
 Display PROMPT and read a string that represents a character by its
-Unicode property `name' or `old-name'.  You can type a few of first
-letters of the Unicode name and use completion.  This function also
-accepts a hexadecimal number of Unicode code point or a number in
-hash notation, e.g. #o21430 for octal, #x2318 for hex, or #10r8984
-for decimal.  Returns a character as a number."
+Unicode property `name' or `old-name'.
+
+This function returns the character as a number.
+
+You can type a few of the first letters of the Unicode name and
+use completion.  If you type a substring of the Unicode name
+preceded by an asterisk `*' and use completion, it will show all
+the characters whose names include that substring, not necessarily
+at the beginning of the name.
+
+This function also accepts a hexadecimal number of Unicode code
+point or a number in hash notation, e.g. #o21430 for octal,
+#x2318 for hex, or #10r8984 for decimal."
   (let* ((completion-ignore-case t)
 	 (input (completing-read prompt ucs-completions)))
     (cond
@@ -2957,6 +2965,13 @@ for decimal.  Returns a character as a number."
   "Insert COUNT copies of CHARACTER of the given Unicode code point.
 Interactively, prompts for a Unicode character name or a hex number
 using `read-char-by-name'.
+
+You can type a few of the first letters of the Unicode name and
+use completion.  If you type a substring of the Unicode name
+preceded by an asterisk `*' and use completion, it will show all
+the characters whose names include that substring, not necessarily
+at the beginning of the name.
+
 The optional third arg INHERIT (non-nil when called interactively),
 says to inherit text properties from adjoining text, if those
 properties are sticky."
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 07f6920a128..4c8c8214195 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -4306,7 +4306,7 @@ With prefix argument N moves forward N messages with these labels.
 
 ;;;***
 
-;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "3e235bdf4c2e54da06abcdd72e7f7649")
+;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "9c0902449733cabd5c7e7d17092a7c69")
 ;;; Generated autoloads from rmailmm.el
 
 (autoload 'rmail-mime "rmailmm" "\
diff --git a/lisp/mail/rmailmm.el b/lisp/mail/rmailmm.el
index 127fd8ac350..0bfeb121ca4 100644
--- a/lisp/mail/rmailmm.el
+++ b/lisp/mail/rmailmm.el
@@ -472,10 +472,11 @@ See `rmail-mime-entity' for the detail."
 HEADER is a header component of a MIME-entity object (see
 `rmail-mime-entity')."
   (with-temp-buffer
-    (let ((last-coding-system-used nil))
+    (let ((buf (current-buffer)))
       (with-current-buffer rmail-mime-mbox-buffer
-	(let ((rmail-buffer rmail-mime-mbox-buffer)
-	      (rmail-view-buffer rmail-mime-view-buffer))
+	(let ((last-coding-system-used nil)
+	      (rmail-buffer rmail-mime-mbox-buffer)
+	      (rmail-view-buffer buf))
 	  (save-excursion
 	    (goto-char (aref header 0))
 	    (rmail-copy-headers (point) (aref header 1)))))
@@ -514,7 +515,9 @@ HEADER is a header component of a MIME-entity object (see
 	      ((string= transfer-encoding "quoted-printable")
 	       (quoted-printable-decode-region pos (point))))))
     (decode-coding-region pos (point) coding-system)
-    (if (or (not rmail-mime-coding-system) (consp rmail-mime-coding-system))
+    (if (and
+	 (or (not rmail-mime-coding-system) (consp rmail-mime-coding-system))
+	 (not (eq (coding-system-base coding-system) 'us-ascii)))
 	(setq rmail-mime-coding-system coding-system))
     (or (bolp) (insert "\n"))))
 
@@ -1302,7 +1305,10 @@ attachments as specfied by `rmail-mime-attachment-dirs-alist'."
 		      (rmail-mime-find-header-encoding
 		       (rmail-mime-entity-header entity)))))
 	  (set-buffer-file-coding-system
-	   (coding-system-base rmail-mime-coding-system) t t))
+	   (if rmail-mime-coding-system
+	       (coding-system-base rmail-mime-coding-system)
+	     'undecided)
+	   t t))
       ;; Decoding failed.  ENTITY is an error message.  Insert the
       ;; original message body as is, and show warning.
       (let ((region (with-current-buffer rmail-mime-mbox-buffer
diff --git a/lisp/simple.el b/lisp/simple.el
index 531c9212e34..a2dda5f04d2 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -5723,7 +5723,10 @@ appears to have customizations applying to the old default,
   :group 'mail)
 
 (defun rfc822-goto-eoh ()
-  ;; Go to header delimiter line in a mail message, following RFC822 rules
+  "If the buffer starts with a mail header, move point to the header's end.
+Otherwise, moves to `point-min'.
+The end of the header is the start of the next line, if there is one,
+else the end of the last line.  This function obeys RFC822."
   (goto-char (point-min))
   (when (re-search-forward
 	 "^\\([:\n]\\|[^: \t\n]+[ \t\n]\\)" nil 'move)
diff --git a/lisp/vc/log-edit.el b/lisp/vc/log-edit.el
index 9ec3e970b5e..192ab1f78d2 100644
--- a/lisp/vc/log-edit.el
+++ b/lisp/vc/log-edit.el
@@ -621,14 +621,18 @@ regardless of user name or time."
           (delete-region start end)
           (rfc822-goto-eoh)
           (insert "Fixes: " fixes "\n" (if (looking-at "\n") "" "\n")))))
-    (goto-char (point-min))
-    (when (and log-edit-strip-single-file-name (looking-at "\\*\\s-+"))
-      (forward-line 1)
-      (when (not (re-search-forward "^\\*\\s-+" nil t))
-        (goto-char (point-min))
-        (skip-chars-forward "^():")
-        (skip-chars-forward ": ")
-        (delete-region (point-min) (point))))))
+    (and log-edit-strip-single-file-name
+         (progn (rfc822-goto-eoh)
+                (if (looking-at "\n") (forward-char 1))
+                (looking-at "\\*\\s-+"))
+         (let ((start (point)))
+           (forward-line 1)
+           (when (not (re-search-forward "^\\*\\s-+" nil t))
+             (goto-char start)
+             (skip-chars-forward "^():")
+             (skip-chars-forward ": ")
+             (delete-region start (point)))))
+    (goto-char (point-min))))
 
 ;;;;
 ;;;; functions for getting commit message from ChangeLog a file...