auto upstream

21 files changed, 202 insertions, 133 deletions

diff --git a/ChangeLog b/ChangeLog
index 84d9987ccea..2737f6284b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-03-03  Glenn Morris  <rgm@gnu.org>
+
+        * make-dist: Remove lzma (it's replaced by xz).
+
 2013-03-01  Paul Eggert  <eggert@cs.ucla.edu>
 
         Merge from gnulib, incorporating:
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 28e25ad98a3..9389a6af28f 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-03  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * bzrmerge.el (bzrmerge-apply): Omit Latin-1 char from diagnostic.
+        If there were a real need, it should be UTF-8 anyway.
+
 2013-02-25  Paul Eggert  <eggert@cs.ucla.edu>
 
         Simplify data_start configuration (Bug#13783).
diff --git a/admin/bzrmerge.el b/admin/bzrmerge.el
index b95c96d77ef..4fa328b9d6d 100644
--- a/admin/bzrmerge.el
+++ b/admin/bzrmerge.el
@@ -320,7 +320,7 @@ Does not make other difference."
                   ;; bzrmerge-add-metadata does not work when there
                   ;; are conflicts.
                   (display-warning 'bzrmerge "Resolve conflicts manually.
-¡BEWARE!  Important metadata is kept in this Emacs session!
+BEWARE!  Important metadata is kept in this Emacs session!
 Do not commit without re-running `M-x bzrmerge' first!"
                                    :warning bzrmerge-warning-buffer))
               (error "Resolve conflicts manually")))))
diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index 993d0d051e8..615551225cb 100644
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-03  Glenn Morris  <rgm@gnu.org>
+
+        * emacs-lisp-intro.texi (Digression into C): Update example.
+        (defcustom): Fix typo.
+
 2012-12-22  Glenn Morris  <rgm@gnu.org>
 
         * Makefile.in (srcs): New variable, adding doclicense.texi.
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index 3f9208c3c27..f1f9315747a 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -9116,8 +9116,8 @@ Lisp; it is written in C and is one of the primitives of the GNU Emacs
 system.  Since it is very simple, I will digress briefly from Lisp and
 describe it here.
 
-@c GNU Emacs 22  in /usr/local/src/emacs/src/editfns.c
-@c the DEFUN for  buffer-substring-no-properties
+@c GNU Emacs 24  in src/editfns.c
+@c the DEFUN for  delete-and-extract-region
 
 @need 1500
 Like many of the other Emacs primitives,
@@ -9127,22 +9127,15 @@ like this:
 
 @smallexample
 @group
-DEFUN ("buffer-substring-no-properties", Fbuffer_substring_no_properties,
-       Sbuffer_substring_no_properties, 2, 2, 0,
-       doc: /* Return the characters of part of the buffer,
-without the text properties.
-The two arguments START and END are character positions;
-they can be in either order.  */)
-     (start, end)
-     Lisp_Object start, end;
+DEFUN ("delete-and-extract-region", Fdelete_and_extract_region,
+       Sdelete_and_extract_region, 2, 2, 0,
+       doc: /* Delete the text between START and END and return it.  */)
+       (Lisp_Object start, Lisp_Object end)
 @{
-  register int b, e;
-
   validate_region (&start, &end);
-  b = XINT (start);
-  e = XINT (end);
-
-  return make_buffer_string (b, e, 0);
+  if (XINT (start) == XINT (end))
+    return empty_unibyte_string;
+  return del_range_1 (XINT (start), XINT (end), 1, 1);
 @}
 @end group
 @end smallexample
@@ -9192,20 +9185,9 @@ and provides a prompt.
 
 @item
 The seventh part is a documentation string, just like the one for a
-function written in Emacs Lisp, except that every newline must be
-written explicitly as @samp{\n} followed by a backslash and carriage
-return.
-
-@need 1000
-Thus, the first two lines of documentation for  @code{goto-char} are
-written like this:
-
-@smallexample
-@group
-  "Set point to POSITION, a number or marker.\n\
-Beginning of buffer is position (point-min), end is (point-max)."
-@end group
-@end smallexample
+function written in Emacs Lisp.  This is written as a C comment.  (When
+you build Emacs, the program @command{lib-src/make-docfile} extracts
+these comments and uses them to make the ``real'' documentation.)
 @end itemize
 
 @need 1200
@@ -9218,15 +9200,15 @@ consists of the following four lines:
 @group
 validate_region (&start, &end);
 if (XINT (start) == XINT (end))
-  return build_string ("");
+  return empty_unibyte_string;
 return del_range_1 (XINT (start), XINT (end), 1, 1);
 @end group
 @end smallexample
 
-The   @code{validate_region} function checks whether the values
+The @code{validate_region} function checks whether the values
 passed as the beginning and end of the region are the proper type and
 are within range.  If the beginning and end positions are the same,
-then return and empty string.
+then return an empty string.
 
 The @code{del_range_1} function actually deletes the text.  It is a
 complex function we will not look into.  It updates the buffer and
@@ -17010,7 +16992,7 @@ For example, the customizable user option variable
   "Normal hook run when entering Text mode and many related modes."
   :type 'hook
   :options '(turn-on-auto-fill flyspell-mode)
-  :group 'data)
+  :group 'wp)
 @end group
 @end smallexample
 
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 42f5b5f5536..16866d5c8c9 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2013-03-03  Glenn Morris  <rgm@gnu.org>
+
+        * objects.texi (Symbol Type): Fix typo.
+
 2013-02-28  Bastien Guerry  <bzg@gnu.org>
 
         * variables.texi (File Local Variables): Fix reference.
diff --git a/doc/lispref/objects.texi b/doc/lispref/objects.texi
index 0437d2337a3..3b7dc41335b 100644
--- a/doc/lispref/objects.texi
+++ b/doc/lispref/objects.texi
@@ -565,8 +565,8 @@ Lisp, upper case and lower case letters are distinct.
 @end quotation
 
   Here are several examples of symbol names.  Note that the @samp{+} in
-the fifth example is escaped to prevent it from being read as a number.
-This is not necessary in the fourth example because the rest of the name
+the fourth example is escaped to prevent it from being read as a number.
+This is not necessary in the sixth example because the rest of the name
 makes it invalid as a number.
 
 @example
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index b256bac417f..eda50177720 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,21 @@
+2013-03-03  Michael Albinus  <michael.albinus@gmx.de>
+
+        * tramp.texi (External methods): Tramp does not connect Android
+        devices by itself.
+
+2013-03-02  Bill Wohler  <wohler@newt.com>
+
+        Release MH-E manual version 8.5.
+
+        * mh-e.texi (VERSION, EDITION, UPDATED, UPDATE-MONTH): Update for
+        release 8.5.
+
+        * mh-e.texi (Preface, Conventions, Getting Started)
+        (Using This Manual, Folder Selection, Viewing, Aliases)
+        (Identities, Speedbar, Menu Bar, Tool Bar, Scan Line Formats)
+        (Bug Reports, Mailing Lists, MH FAQ and Support, Getting MH-E):
+        Update URLs.
+
 2013-03-01  Michael Albinus  <michael.albinus@gmx.de>
 
         * tramp.texi (Inline methods): Remove "ssh1", "ssh2", "plink1"
diff --git a/doc/misc/mh-e.texi b/doc/misc/mh-e.texi
index 756d5d52996..08b1164f53a 100644
--- a/doc/misc/mh-e.texi
+++ b/doc/misc/mh-e.texi
@@ -8,12 +8,12 @@
 @c %**end of header
 
 @c Version of the software and manual.
-@set VERSION 8.4
+@set VERSION 8.5
 @c Edition of the manual. It is either empty for the first edition or
 @c has the form ", nth Edition" (without the quotes).
 @set EDITION
-@set UPDATED 2012-11-25
-@set UPDATE-MONTH November, 2012
+@set UPDATED 2013-03-02
+@set UPDATE-MONTH March, 2013
 
 @c Other variables.
 @set MH-BOOK-HOME http://rand-mh.sourceforge.net/book/mh
@@ -236,7 +236,7 @@ read an online tutorial by starting GNU Emacs and typing @kbd{C-h t}
 @ref{top, , GNU Emacs Manual, emacs, GNU Emacs Manual},
 @end ifinfo
 @ifhtml
-@uref{http://www.gnu.org/software/emacs/manual/html_node/,
+@uref{http://www.gnu.org/software/emacs/manual/html_node/emacs/,
 @cite{GNU Emacs Manual}},
 @end ifhtml
 from the Free Software Foundation.
@@ -255,9 +255,9 @@ version is distributed with Emacs and can be accessed with the
 @command{info} command (@samp{info mh-e}) or within Emacs (@kbd{C-h i
 m mh-e @key{RET}}). The online version is available at
 @uref{http://mh-e.sourceforge.net/manual/, SourceForge}. Another great
-online resource is the book @uref{http://www.ics.uci.edu/~mh/book/,
-@cite{MH & nmh: Email for Users & Programmers}} (also known as
-@dfn{the MH book}).
+online resource is the book
+@uref{http://rand-mh.sourceforge.net/book/, @cite{MH & nmh: Email for
+Users & Programmers}} (also known as @dfn{the MH book}).
 
 I hope you enjoy this manual! If you have any comments, or suggestions
 for this document, please let me know.
@@ -384,7 +384,7 @@ GNU Emacs Manual}.
 @end ifnothtml
 @ifhtml
 See section
-@uref{http://www.gnu.org/software/emacs/manual/html_node/Easy-Customization.html,
+@uref{http://www.gnu.org/software/emacs/manual/html_node/emacs/Easy-Customization.html,
 Easy Customization} in @cite{The GNU Emacs Manual}.
 @end ifhtml
 @xref{Options}.
@@ -404,7 +404,7 @@ GNU Emacs Manual}.
 @end ifnothtml
 @ifhtml
 See section
-@uref{http://www.gnu.org/software/emacs/manual/html_node/Face-Customization.html,
+@uref{http://www.gnu.org/software/emacs/manual/html_node/emacs/Face-Customization.html,
 Face Customization} in @cite{The GNU Emacs Manual}.
 @end ifhtml
 
@@ -422,7 +422,7 @@ Emacs Manual}
 @end ifnothtml
 @ifhtml
 See section
-@uref{http://www.gnu.org/software/emacs/manual/html_node/Hooks.html,
+@uref{http://www.gnu.org/software/emacs/manual/html_node/emacs/Hooks.html,
 Hooks} in @cite{The GNU Emacs Manual}
 @end ifhtml
 for a description about @dfn{normal hooks} and @dfn{abnormal hooks}.
@@ -473,7 +473,7 @@ point.
 @end ifnothtml
 @ifhtml
 See the section
-@uref{http://www.gnu.org/software/emacs/manual/html_node/Completion.html,
+@uref{http://www.gnu.org/software/emacs/manual/html_node/emacs/Completion.html,
 Completion} in @cite{The GNU Emacs Manual}.
 @end ifhtml
 Note that @key{SPC} cannot be used for completing filenames and
@@ -550,12 +550,12 @@ to install MH or tell MH-E where to find MH.
 @cindex GNU mailutils MH
 
 If you don't have MH on your system already, you must install a
-variant of MH@. The Debian mh-e package does this for you automatically
-(@pxref{Getting MH-E}). Most people use
+variant of MH@. The Debian mh-e package does this for you
+automatically (@pxref{Getting MH-E}). Most people use
 @uref{http://www.nongnu.org/nmh/, nmh}, but you may be interested in
-trying out @uref{http://www.gnu.org/software/mailutils/, GNU mailutils
-MH}, which supports IMAP@. Your GNU/Linux distribution probably has
-packages for both of these.
+trying out @uref{http://mailutils.org/, GNU mailutils MH}, which
+supports IMAP@. Your GNU/Linux distribution probably has packages for
+both of these.
 
 @cindex @command{install-mh}
 @cindex MH commands, @command{install-mh}
@@ -1121,27 +1121,27 @@ exist,
 @footnote{The @cite{GNU Emacs Lisp Reference Manual} may be available
 online in the Info system by typing @kbd{C-h i m Emacs Lisp
 @key{RET}}. It is also available online at @*
-@uref{http://www.gnu.org/software/emacs/elisp-manual/html_node/}. You
-can also order a printed manual, which has the desirable side-effect
-of helping to support the Free Software Foundation which made all this
-great software available. You can find an order form by running
-@kbd{C-h C-d}, or you can request an order form from @i{gnu at
+@uref{http://www.gnu.org/savannah-checkouts/gnu/emacs/manual/html_node/elisp/}.
+You can also order a printed manual, which has the desirable
+side-effect of helping to support the Free Software Foundation which
+made all this great software available. You can find an order form by
+running @kbd{C-h C-d}, or you can request an order form from @i{gnu at
 gnu.org}.}
 @end iftex
 @ifinfo
 @footnote{@xref{Top, The GNU Emacs Lisp Reference Manual, , elisp, GNU
 Emacs Lisp Reference Manual}, which may be available online in the
 Info system. It is also available online at
-@uref{http://www.gnu.org/software/emacs/elisp-manual/html_node/}. You
-can also order a printed manual, which has the desirable side-effect
-of helping to support the Free Software Foundation which made all this
-great software available. You can find an order form by running
-@kbd{C-h C-d}, or you can request an order form from @i{gnu at
+@uref{http://www.gnu.org/savannah-checkouts/gnu/emacs/manual/html_node/elisp/}.
+You can also order a printed manual, which has the desirable
+side-effect of helping to support the Free Software Foundation which
+made all this great software available. You can find an order form by
+running @kbd{C-h C-d}, or you can request an order form from @i{gnu at
 gnu.org}.}
 @end ifinfo
 @ifhtml
 @footnote{The
-@uref{http://www.gnu.org/software/emacs/elisp-manual/html_node/,
+@uref{http://www.gnu.org/savannah-checkouts/gnu/emacs/manual/html_node/elisp/,
 The GNU Emacs Lisp Reference Manual} may also be available online in
 the Info system by typing @kbd{C-h i m Emacs Lisp @key{RET}}. You can
 also order a printed manual, which has the desirable side-effect of
@@ -1311,7 +1311,7 @@ When you choose a folder in MH-E via a command such as @kbd{o}
 @end ifnothtml
 @ifhtml
 (see the section
-@uref{http://www.gnu.org/software/emacs/manual/html_node/Completion.html,
+@uref{http://www.gnu.org/software/emacs/manual/html_node/emacs/Completion.html,
 Completion} in @cite{The GNU Emacs Manual}).
 @end ifhtml
 In addition, MH-E has several ways of choosing a suitable default so
@@ -2089,8 +2089,7 @@ expressions are not allowed. Unique fields should have a @samp{:}
 suffix; otherwise, the element can be used to render invisible an
 entire class of fields that start with the same prefix. If you think a
 header field should be generally ignored, please update
-@uref{https://sourceforge.net/tracker/index.php?func=detail&aid=1916032&group_id=13357&atid=113357,
-SF #1916032}.
+@uref{https://sourceforge.net/p/mh-e/bugs/245/, SF #245}.
 
 @cindex header field, @samp{Face:}
 @cindex header field, @samp{X-Face:}
@@ -2142,12 +2141,12 @@ Finally, MH-E will display images referenced by the
 @samp{X-Face:} fields are present@footnote{The display of the images
 requires the @uref{http://www.gnu.org/software/wget/wget.html,
 @command{wget} program} to fetch the image and the @command{convert}
-program from the @uref{http://www.imagemagick.org/, ImageMagick
-suite}.}. Of the three header fields this is the most efficient in
-terms of network usage since the image doesn't need to be transmitted
-with every single mail. The option @code{mh-fetch-x-image-url}
-controls the fetching of the @samp{X-Image-URL:} header field image
-with the following values:
+program from the @uref{http://www.imagemagick.org/script/index.php,
+ImageMagick suite}.}. Of the three header fields this is the most
+efficient in terms of network usage since the image doesn't need to be
+transmitted with every single mail. The option
+@code{mh-fetch-x-image-url} controls the fetching of the
+@samp{X-Image-URL:} header field image with the following values:
 
 @table @samp
 @item Ask Before Fetching
@@ -6025,7 +6024,7 @@ GNU Emacs Manual}).
 @end ifnothtml
 @ifhtml
 (see the section
-@uref{http://www.gnu.org/software/emacs/manual/html_node/Regexps.html,
+@uref{http://www.gnu.org/software/emacs/manual/html_node/emacs/Regexps.html,
 Syntax of Regular Expressions} in
 @cite{The GNU Emacs Manual}).
 @end ifhtml
@@ -6175,7 +6174,7 @@ GNU Emacs Manual}).
 @end ifnothtml
 @ifhtml
 (see the section
-@uref{http://www.gnu.org/software/emacs/manual/html_node/Regexps.html,
+@uref{http://www.gnu.org/software/emacs/manual/html_node/emacs/Regexps.html,
 Syntax of Regular Expressions} in
 @cite{The GNU Emacs Manual}).
 @end ifhtml
@@ -6283,7 +6282,7 @@ You can also use the speedbar
 @end ifnothtml
 @ifhtml
 (see the section
-@uref{http://www.gnu.org/software/emacs/manual/html_node/Speedbar.html,
+@uref{http://www.gnu.org/software/emacs/manual/html_node/emacs/Speedbar.html,
 Speedbar Frames} in @cite{The GNU Emacs Manual})
 @end ifhtml
 to view your folders. To bring up the speedbar, run @kbd{M-x speedbar
@@ -6415,7 +6414,7 @@ For a description of the menu bar, please
 @end ifnothtml
 @ifhtml
 see the section
-@uref{http://www.gnu.org/software/emacs/manual/html_node/Menu-Bar.html,
+@uref{http://www.gnu.org/software/emacs/manual/html_node/emacs/Menu-Bar.html,
 The Menu Bar} in @cite{The GNU Emacs Manual}.
 @end ifhtml
 
@@ -6437,7 +6436,7 @@ tool bar, please
 @end ifnothtml
 @ifhtml
 see the section
-@uref{http://www.gnu.org/software/emacs/manual/html_node/Tool-Bars.html,
+@uref{http://www.gnu.org/software/emacs/manual/html_node/emacs/Tool-Bars.html,
 Tool Bars} in @cite{The GNU Emacs Manual}.
 @end ifhtml
 
@@ -8219,7 +8218,7 @@ GNU Emacs Manual}.
 @end ifnothtml
 @ifhtml
 section
-@uref{http://www.gnu.org/software/emacs/manual/html_node/Regexps.html,
+@uref{http://www.gnu.org/software/emacs/manual/html_node/emacs/Regexps.html,
 Syntax of Regular Expressions} in @cite{The GNU Emacs Manual}.
 @end ifhtml
 
@@ -8712,12 +8711,11 @@ I also point out some additional sources of information.
 @kindex M-x mh-version
 
 Bug reports should be filed at
-@uref{https://sourceforge.net/tracker/?group_id=13357&atid=113357,
-SourceForge}. You need to be a SourceForge user to submit bug reports,
-but this is easy enough to do that it shouldn't be a restriction for
-you. Please include the output of @kbd{M-x mh-version}
-(@pxref{Miscellaneous}) in any bug report you send unless you're 110%
-positive we won't ask for it.
+@uref{https://sourceforge.net/p/mh-e/bugs/, SourceForge}. You need to
+be a SourceForge user to submit bug reports, but this is easy enough
+to do that it shouldn't be a restriction for you. Please include the
+output of @kbd{M-x mh-version} (@pxref{Miscellaneous}) in any bug
+report you send unless you're 110% positive we won't ask for it.
 
 @node Mailing Lists, MH FAQ and Support, Bug Reports, Odds and Ends
 @appendixsec MH-E Mailing Lists
@@ -8728,7 +8726,7 @@ positive we won't ask for it.
 There are several mailing lists for MH-E@. They are @i{mh-e-users at
 lists.sourceforge.net}, @i{mh-e-announce at lists.sourceforge.net},
 and @i{mh-e-devel at lists.sourceforge.net}. You can subscribe or view
-the archives at @uref{https://sourceforge.net/mail/?group_id=13357,
+the archives at @uref{https://sourceforge.net/p/mh-e/mailman/,
 SourceForge}. Do not report bugs on these lists; please submit them
 via SourceForge (@pxref{Bug Reports}).
 
@@ -8746,11 +8744,10 @@ itself which you will find useful.
 
 @cindex support
 
-You can find FAQs on MH-E at the
-@uref{https://sourceforge.net/tracker/?group_id=13357&atid=213357,
-Support Requests} page on SourceForge. If you don't find the answer to
-your question, file a support request and your question will become a
-new FAQ!
+You can find FAQs on MH-E by searching for @i{labels:support} on the
+@uref{https://sourceforge.net/p/mh-e/bugs/search/?q=labels%3Asupport,
+Tickets} page on SourceForge. If you don't find the answer to your
+question, file a ticket and your question will become a new FAQ!
 
 @node Getting MH-E,  , MH FAQ and Support, Odds and Ends
 @appendixsec Getting MH-E
@@ -8768,13 +8765,13 @@ distribution in @file{miscellany/mh-e}.
 @cindex release notes
 
 New MH-E releases are always available for downloading at
-@uref{https://sourceforge.net/project/showfiles.php?group_id=13357,
-SourceForge} before they appear in an Emacs release. You can read the
-release notes on that page to determine if the given release of MH-E
-is already installed in your version of Emacs. You can also read the
-change log to see if you are interested in what the given release of
-MH-E has to offer (although we have no doubt that you will be
-extremely interested in all new releases).
+@uref{https://sourceforge.net/projects/mh-e/files/, SourceForge}
+before they appear in an Emacs release. You can read the release notes
+on that page to determine if the given release of MH-E is already
+installed in your version of Emacs. You can also read the change log
+to see if you are interested in what the given release of MH-E has to
+offer (although we have no doubt that you will be extremely interested
+in all new releases).
 
 @cindex Debian
 
@@ -8802,10 +8799,10 @@ MH-E@. Check that you're running the new version with the command
 @cindex documentation
 
 In addition to the mh-e package, the
-@uref{https://sourceforge.net/project/showfiles.php?group_id=13357,
-SourceForge} site also contains doc and contrib packages. The former
-is the latest release of this manual, and the latter contains a few
-contributed packages you might find useful.
+@uref{https://sourceforge.net/projects/mh-e/files/, SourceForge} site
+also contains doc and contrib packages. The former is the latest
+release of this manual, and the latter contains a few contributed
+packages you might find useful.
 
 @node History, GFDL, Odds and Ends, Top
 @appendix History of MH-E
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 84eee0c4319..4a3e0ebc33c 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -998,25 +998,27 @@ name.
 @cindex method adb
 @cindex adb method
 
-This special method uses the Android Debug Bridge for connecting
+This special method uses the Android Debug Bridge for accessing
 Android devices.  The Android Debug Bridge must be installed locally.
 Some GNU/Linux distributions offer it for installation, otherwise it
-can be installed as part of the Android SDK.  If @command{adb} is not
-found via the @code{$PATH} environment variable, the variable
-@var{tramp-adb-program} must point to its absolute path.
+can be installed as part of the Android SDK.  If the @command{adb}
+program is not found via the @code{$PATH} environment variable, the
+variable @var{tramp-adb-program} must point to its absolute path.
+
+Tramp does not connect Android devices to @command{adb}.  This must be
+performed outside @value{emacsname}.  If there is exactly one Android
+device connected to @command{adb}, a host name is not needed in the
+remote file name.  The default @value{tramp} name to be used is
+@file{@trampfn{adb, , ,}} therefore.  Otherwise, one could find
+potential host names with the command @command{adb devices}.
 
 Usually, the @command{adb} method does not need any user name.  It
 runs under the permissions of the @command{adbd} process on the
 Android device.  If a user name is specified, @value{tramp} applies an
 @command{su} on the device.  This does not work with all Android
-devices, especially with nonrooted ones.  In that case, an error
+devices, especially with unrooted ones.  In that case, an error
 message is displayed.
 
-If there is exactly one Android device connected to the local machine,
-a host name is not needed.  The shortest @value{tramp} name to be used
-is @file{@trampfn{adb, , ,}} therefore.  Otherwise, one could find
-potential host names with the shell command @command{adb devices}.
-
 @end table
 
 
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 7ebb2a751ab..367f7c63264 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,9 @@
+2013-03-02  Bill Wohler  <wohler@newt.com>
+
+        Release MH-E version 8.5.
+
+        * NEWS, MH-E-NEWS: Update for MH-E release 8.5.
+
 2013-03-02  Paul Eggert  <eggert@cs.ucla.edu>
 
         * NEWS: The lock for FILE is now .#FILE or .#-FILE (Bug#13807).
diff --git a/etc/MH-E-NEWS b/etc/MH-E-NEWS
index 846504c9014..c35eb72e8d9 100644
--- a/etc/MH-E-NEWS
+++ b/etc/MH-E-NEWS
@@ -3,6 +3,25 @@
 Copyright (C) 2001-2013 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
+* Changes in MH-E 8.5
+
+Version 8.5 fixes bugs when incorporating or forwarding mail.
+
+** Bug Fixes in MH-E 8.5
+
+*** mh-rmail doesn't switch to +inbox
+
+The function `mh-rmail' now switches to `+inbox' as expected (closes
+SF #271).
+
+*** Problem forwarding a message
+
+Forwarding messages resulted in the error: `(wrong-type-argument
+number-or-marker-p nil).' This has been fixed by setting the mail
+separator (closes SF #270).
+
+
+
 * Changes in MH-E 8.4
 
 Version 8.4 postpones junk processing and merges in your components
@@ -986,7 +1005,7 @@ Renamed from `mh-speedbar-selected-folder-face' per new Emacs conventions.
 *** mh-speedbar-selected-folder-with-unseen-messages
 
 Renamed from `mh-speedbar-selected-folder-with-unseen-messages-face'
-per new Emacs conventions. 
+per new Emacs conventions.
 
 
 
@@ -1099,7 +1118,7 @@ Emacs conventions.
 
 *** Face Variable Names Now Follow Current Conventions
 
-The -face suffix has been dropped from all face names. 
+The -face suffix has been dropped from all face names.
 
 *** Swish Fixes
 
@@ -3360,4 +3379,3 @@ Local variables:
 mode: outline
 paragraph-separate: "[  ]*$"
 end:
-
diff --git a/etc/NEWS b/etc/NEWS
index 73f7991823f..8ae8ae3bf16 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -159,7 +159,7 @@ callers to fit the image to a frame other than the selected frame.
 *** `C-x 8 RET' in Isearch mode reads a character by its Unicode name
 and adds it to the search string.
 
-** MH-E has been updated to MH-E version 8.4.
+** MH-E has been updated to MH-E version 8.5.
 See MH-E-NEWS for details.
 
 ---
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8b6ffeed01d..a19ebaf473f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-03  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp-adb.el (tramp-adb-maybe-open-connection): Cache,
+        whether the "su" command is available on the device.
+
 2013-03-01  Michael Albinus  <michael.albinus@gmx.de>
 
         * net/tramp-adb.el (tramp-adb-prompt): Extend regexp.
diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index 0854010e60f..6894a185ddc 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,3 +1,19 @@
+2013-03-02  Bill Wohler  <wohler@newt.com>
+
+        Release MH-E version 8.5.
+
+        * mh-e.el (Version, mh-version): Update for release 8.5.
+
+2013-03-02  Jeffrey C Honig  <jch@honig.net>
+
+        * mh-folder.el (mh-inc-folder): Revert SF #2321115, SF #250
+        which processed pending deletes and refiles.  Call to
+        mh-process-or-undo-commands to insure that pending changes are
+        properly tagged after including new mail (closes SF #271).
+
+        * mh-comp.el: Insure that mail-header-separator is set before
+        invoking any mml functions (closes SF #270).
+
 2013-01-23  Dmitry Antipov  <dmantipov@yandex.ru>
 
         * mh-acros.el (mh-do-at-event-location): Use point-marker.
diff --git a/lisp/mh-e/mh-comp.el b/lisp/mh-e/mh-comp.el
index fbfc1207a5a..1f07a7983b1 100644
--- a/lisp/mh-e/mh-comp.el
+++ b/lisp/mh-e/mh-comp.el
@@ -587,6 +587,13 @@ See also `mh-compose-forward-as-mime-flag',
              (mh-forwarded-letter-subject orig-from orig-subject)))
         (mh-insert-fields "Subject:" forw-subject)
         (goto-char (point-min))
+        ;; Set the local value of mh-mail-header-separator according to what is
+        ;; present in the buffer...
+        (set (make-local-variable 'mh-mail-header-separator)
+             (save-excursion
+               (goto-char (mh-mail-header-end))
+               (buffer-substring-no-properties (point) (mh-line-end-position))))
+        (set (make-local-variable 'mail-header-separator) mh-mail-header-separator) ;override sendmail.el
         ;; If using MML, translate MH-style directive
         (if (equal mh-compose-insertion 'mml)
             (save-excursion
diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el
index 334f73ff7ed..6ed033b8fa8 100644
--- a/lisp/mh-e/mh-e.el
+++ b/lisp/mh-e/mh-e.el
@@ -5,7 +5,7 @@
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
-;; Version: 8.4
+;; Version: 8.5
 ;; Keywords: mail
 
 ;; This file is part of GNU Emacs.
@@ -127,7 +127,7 @@
 ;; Try to keep variables local to a single file. Provide accessors if
 ;; variables are shared. Use this section as a last resort.
 
-(defconst mh-version "8.4" "Version number of MH-E.")
+(defconst mh-version "8.5" "Version number of MH-E.")
 
 ;; Variants
 
diff --git a/lisp/mh-e/mh-folder.el b/lisp/mh-e/mh-folder.el
index f3ea8003ed0..01f304a38dc 100644
--- a/lisp/mh-e/mh-folder.el
+++ b/lisp/mh-e/mh-folder.el
@@ -774,7 +774,7 @@ the message."
     return-value))
 
 ;;;###mh-autoload
-(defun mh-inc-folder (&optional file folder dont-exec-pending)
+(defun mh-inc-folder (&optional file folder)
   "Incorporate new mail into a folder.
 
 You can incorporate mail from any file into the current folder by
@@ -785,10 +785,7 @@ The hook `mh-inc-folder-hook' is run after incorporating new
 mail.
 
 Do not call this function from outside MH-E; use \\[mh-rmail]
-instead.
-
-In a program, the processing of outstanding commands is not performed
-if DONT-EXEC-PENDING is non-nil."
+instead."
   (interactive (list (if current-prefix-arg
                          (expand-file-name
                           (read-file-name "inc mail from file: "
@@ -797,8 +794,6 @@ if DONT-EXEC-PENDING is non-nil."
                          (mh-prompt-for-folder "inc mail into" mh-inbox t))))
   (if (not folder)
       (setq folder mh-inbox))
-  (unless dont-exec-pending
-    (mh-process-or-undo-commands folder))
   (let ((threading-needed-flag nil))
     (let ((config (current-window-configuration)))
       (when (and mh-show-buffer (get-buffer mh-show-buffer))
@@ -820,6 +815,8 @@ if DONT-EXEC-PENDING is non-nil."
                           nil))))
       (mh-toggle-threads))
     (beginning-of-line)
+    (when (mh-outstanding-commands-p)
+      (mh-notate-deleted-and-refiled))
     (if (and mh-showing-mode (looking-at mh-scan-valid-regexp)) (mh-show))
     (run-hooks 'mh-inc-folder-hook)))
 
diff --git a/lisp/net/tramp-adb.el b/lisp/net/tramp-adb.el
index 910356fbb6c..2d683a4d3d2 100644
--- a/lisp/net/tramp-adb.el
+++ b/lisp/net/tramp-adb.el
@@ -1074,6 +1074,13 @@ connection if a previous connection has died for some reason."
          (host (tramp-file-name-host vec))
          (user (tramp-file-name-user vec))
          (devices (mapcar 'cadr (tramp-adb-parse-device-names nil))))
+
+    ;; Maybe we know already that "su" is not supported.  We cannot
+    ;; use a connection property, because we have not checked yet
+    ;; whether it is still the same device.
+    (when (and user (not (tramp-get-file-property vec "" "su-command-p" t)))
+      (tramp-error vec 'file-error "Cannot switch to user `%s'" user))
+
     (unless
         (and p (processp p) (memq (process-status p) '(run open)))
       (save-match-data
@@ -1133,7 +1140,9 @@ connection if a previous connection has died for some reason."
               (tramp-adb-send-command vec (format "su %s" user))
               (unless (zerop (tramp-adb-command-exit-status vec nil))
                 (delete-process p)
-                (tramp-error vec 'file-error "Cannot switch to user %s" user)))
+                (tramp-set-file-property vec "" "su-command-p" nil)
+                (tramp-error
+                 vec 'file-error "Cannot switch to user `%s'" user)))
 
             ;; Set "remote-path" connection property.  This is needed
             ;; for eshell.
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 92e21c300c7..467ac004420 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -1157,7 +1157,7 @@ all uninitialized dicts using that affix file."
           (use-for-dicts (list dict))
           (dict-args-cdr (cdr (ispell-parse-hunspell-affix-file dict)))
           newlist)
-      ;; Get a list of unitialized dicts using the same affix file.
+      ;; Get a list of uninitialized dicts using the same affix file.
       (dolist (dict-equiv-alist-entry ispell-hunspell-dictionary-equivs-alist)
         (let ((dict-equiv-key (car dict-equiv-alist-entry))
               (dict-equiv-value (cadr dict-equiv-alist-entry)))
diff --git a/make-dist b/make-dist
index a6410421b49..283defe8a7d 100755
--- a/make-dist
+++ b/make-dist
@@ -83,10 +83,6 @@ while [ $# -gt 0 ]; do
     "--bzip2")
       default_gzip="bzip2"
     ;;
-    ## Same with lzma.
-    "--lzma")
-      default_gzip="lzma"
-    ;;
     ## Same with xz.
     "--xz")
       default_gzip="xz"
@@ -107,7 +103,6 @@ while [ $# -gt 0 ]; do
       echo ""
       echo "  --bzip2   use bzip2 instead of gzip"
       echo "  --clean-up        delete staging directories when done"
-      echo "  --lzma    use lzma instead of gzip"
       echo "  --xz              use xz instead of gzip"
       echo "  --no-compress     don't compress"
       echo "  --newer=TIME      don't include files older than TIME"
@@ -518,7 +513,6 @@ if [ "${make_tar}" = yes ]; then
   fi
   case "${default_gzip}" in
     bzip2) gzip_extension=.bz2 ;;
-    lzma)  gzip_extension=.lzma ;;
     xz)  gzip_extension=.xz ;;
     gzip)  gzip_extension=.gz ; default_gzip="gzip --best";;
        *)  gzip_extension= ;;