feature/android fe7861f8088: Merge remote-tracking branch 'origin/master' into feature/android

[Po Lu]

branch: feature/android
commit fe7861f8088b481584b8122769121d2bfe26f643
Merge: fcf53bf9f58 04710bd01b2
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>

    Merge remote-tracking branch 'origin/master' into feature/android
---
 doc/misc/eshell.texi   | 2 +-
 lisp/mh-e/mh-folder.el | 5 +++--
 lisp/mh-e/mh-show.el   | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/doc/misc/eshell.texi b/doc/misc/eshell.texi
index ecc12035650..9b9268ae4ea 100644
--- a/doc/misc/eshell.texi
+++ b/doc/misc/eshell.texi
@@ -267,7 +267,7 @@ As an ordinary Lisp function
 @vindex eshell-prefer-lisp-functions
 If you would prefer to use ordinary Lisp functions over external
 programs, set the option @code{eshell-prefer-lisp-functions} to
-@code{t}.  This will swap the lookup order of the last two items. You
+@code{t}.  This will swap the lookup order of the last two items.  You
 can also force Eshell to look for a command as an external program by
 prefixing its name with @kbd{*}, like @code{*@var{command}}
 (@pxref{Built-ins}).
diff --git a/lisp/mh-e/mh-folder.el b/lisp/mh-e/mh-folder.el
index dbed3c83994..68f72a6e0cf 100644
--- a/lisp/mh-e/mh-folder.el
+++ b/lisp/mh-e/mh-folder.el
@@ -1293,8 +1293,9 @@ The message at the cursor is used for \"cur\"."
     (if new-cur
         (let ((seq-entry (mh-find-seq 'cur)))
           (mh-remove-cur-notation)
-          (setcdr seq-entry
-                  (list new-cur))       ;delete-seq-locally, add-msgs-to-seq
+          (if seq-entry
+              (setcdr seq-entry (list new-cur))
+            (mh-add-msgs-to-seq (list new-cur) 'cur))
           (mh-define-sequence 'cur (list new-cur))
           (beginning-of-line)
           (if (looking-at mh-scan-good-msg-regexp)
diff --git a/lisp/mh-e/mh-show.el b/lisp/mh-e/mh-show.el
index 54d986edc1e..8a26ab6d81e 100644
--- a/lisp/mh-e/mh-show.el
+++ b/lisp/mh-e/mh-show.el
@@ -29,6 +29,7 @@
 ;;; Code:
 
 (require 'mh-e)
+(require 'mh-mime)
 (require 'mh-scan)
 
 ;; Dynamically-created function not found in mh-loaddefs.el.