feature/android 65dddd7c99 4/4: Merge remote-tracking branch 'origin/master' into feature/android

[Po Lu]

branch: feature/android
commit 65dddd7c997d55b04456b0c1f1c9c0259016ad32
Merge: f459c43e94 dfdc0f5fb7
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>

    Merge remote-tracking branch 'origin/master' into feature/android
---
 lisp/mail/rmail.el     | 18 ++++++++++--------
 lisp/progmodes/xref.el |  3 ++-
 src/w32heap.c          |  4 ++--
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 0572283b60..2952db2a6b 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -4582,6 +4582,9 @@ Argument MIME is non-nil if this is a mime message."
             (current-buffer))))
       (error nil))
 
+    ;; Decode any base64-encoded material in what we just decrypted.
+    (rmail-epa-decode armor-start after-end)
+
     (list armor-start (- (point-max) after-end) mime
           armor-end-regexp
           (buffer-substring armor-start (- (point-max) after-end)))))
@@ -4624,9 +4627,6 @@ Argument MIME is non-nil if this is a mime message."
                     "> ")
              (push (rmail-epa-decrypt-1 mime) decrypts))))
 
-      ;; Decode any base64-encoded mime sections.
-      (rmail-epa-decode)
-
       (when (and decrypts (rmail-buffers-swapped-p))
        (when (y-or-n-p "Replace the original message? ")
           (when (eq major-mode 'rmail-mode)
@@ -4691,12 +4691,14 @@ Argument MIME is non-nil if this is a mime message."
       (unless decrypts
        (error "Nothing to decrypt")))))
 
-;; Decode all base64-encoded mime sections, so that this change
-;; is made in the Rmail file, not just in the viewing buffer.
-(defun rmail-epa-decode ()
+;; Decode all base64-encoded mime sections from BEG to (Z - BACK-FROM-END),
+;; so that we save the decoding permanently in the Rmail buffer
+;; if we permanently save the decryption.
+(defun rmail-epa-decode (beg back-from-end)
   (save-excursion
-    (goto-char (point-min))
-    (while (re-search-forward "--------------[0-9a-zA-Z]+\n" nil t)
+    (goto-char beg)
+    (while (re-search-forward "--------------[0-9a-zA-Z]+\n"
+                              (- (point-max) back-from-end) t)
       ;; The ending delimiter is a start delimiter if another section follows.
       ;; Otherwise it is an end delimiter, with -- affixed.
       (let ((delim (concat (substring (match-string 0) 0 -1) "\\(\\|--\\)\n")))
diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el
index 916d83d407..4db0df6c3b 100644
--- a/lisp/progmodes/xref.el
+++ b/lisp/progmodes/xref.el
@@ -568,7 +568,8 @@ This can be used from `xref-after-jump-hook', for 
instance.")
     (dolist (l (list (car history) (cdr history)))
       (dolist (m l)
         (set-marker m nil nil)))
-    (setq history (cons nil nil)))
+    (setcar history nil)
+    (setcdr history nil))
   nil)
 
 ;;;###autoload
diff --git a/src/w32heap.c b/src/w32heap.c
index a1975d9a97..628fc28e3c 100644
--- a/src/w32heap.c
+++ b/src/w32heap.c
@@ -121,9 +121,9 @@ typedef struct _RTL_HEAP_PARAMETERS {
 # define DUMPED_HEAP_SIZE 10
 #else
 # if defined _WIN64 || defined WIDE_EMACS_INT
-#  define DUMPED_HEAP_SIZE (23*1024*1024)
+#  define DUMPED_HEAP_SIZE (28*1024*1024)
 # else
-#  define DUMPED_HEAP_SIZE (13*1024*1024)
+#  define DUMPED_HEAP_SIZE (18*1024*1024)
 # endif
 #endif