commit 4b9f9324a87388ceb7ce1359feb5686efcb2523e (HEAD, refs/remotes/origin/master)
Author: Katsumi Yamaoka <yamaoka@jpl.org>
Date:   Wed Sep 11 02:41:34 2019 +0000

    Create a new overlay used to mark Attachment header (bug#37370)
    
    * lisp/gnus/gnus-art.el (gnus-mime-inline-part)
    (gnus-mm-display-part, gnus-mime-buttonize-attachments-in-header):
    Create a new overlay used to mark Attachment header instead of
    using existing overlays.

diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 04cb087737..eba66c1c3a 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -5378,9 +5378,9 @@ Compressed files like .gz and .bz2 are decompressed."
 				    'gnus-undeletable t))))
 	  ;; We're in the article header.
 	  (delete-char -1)
-	  (dolist (ovl (overlays-in btn (point)))
+	  (let ((ovl (make-overlay btn (point))))
 	    (overlay-put ovl 'gnus-button-attachment-extra t)
-	    (overlay-put ovl 'face nil))
+	    (overlay-put ovl 'evaporate t))
 	  (save-restriction
 	    (message-narrow-to-field)
 	    (let ((gnus-treatment-function-alist
@@ -5763,9 +5763,9 @@ all parts."
 				    'gnus-undeletable t))))
 	  ;; We're in the article header.
 	  (delete-char -1)
-	  (dolist (ovl (overlays-in point (point)))
+	  (let ((ovl (make-overlay point (point))))
 	    (overlay-put ovl 'gnus-button-attachment-extra t)
-	    (overlay-put ovl 'face nil))
+	    (overlay-put ovl 'evaporate t))
 	  (save-restriction
 	    (message-narrow-to-field)
 	    (let ((gnus-treatment-function-alist
@@ -6379,9 +6379,9 @@ in the body.  Use `gnus-header-face-alist' to highlight buttons."
 		  (insert "\n")
 		  (end-of-line)))
 	      (insert "\n")
-	      (dolist (ovl (overlays-in (point-min) (point)))
+	      (let ((ovl (make-overlay (point-min) (point))))
 		(overlay-put ovl 'gnus-button-attachment-extra t)
-		(overlay-put ovl 'face nil))
+		(overlay-put ovl 'evaporate t))
 	      (let ((gnus-treatment-function-alist
 		     '((gnus-treat-highlight-headers
 			gnus-article-highlight-headers))))

commit 3d442312889ef2d14c07282d0aff6199d00cc165
Merge: ac1a2e260e 74e9799bd8
Author: Stephen Leake <stephen_leake@stephe-leake.org>
Date:   Tue Sep 10 03:37:51 2019 -0700

    Merge commit '74e9799bd89484b8d15bdd6597c68fc00d07e7f7'

commit ac1a2e260e8ece34500b5879f766b4e54ee57b94
Author: Stephen Leake <stephen_leake@stephe-leake.org>
Date:   Tue Sep 10 03:36:15 2019 -0700

    Support `cl-defstruct' in autoloads
    
    * lisp/emacs-lisp/autoload.el (make-autoload): Add `cl-defstruct' to
    "complex cases" list.
    
    * lisp/emacs-lisp/cl-macs.el (cl-defstruct): Add :autoload-end to
    limit what is declared in autoloads.el for a defstruct.

diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el
index 541b22e3ee..a2dbd402c5 100644
--- a/lisp/emacs-lisp/autoload.el
+++ b/lisp/emacs-lisp/autoload.el
@@ -165,7 +165,7 @@ expression, in which case we want to handle forms differently."
                        define-globalized-minor-mode defun defmacro
 		       easy-mmode-define-minor-mode define-minor-mode
                        define-inline cl-defun cl-defmacro cl-defgeneric
-                       pcase-defmacro))
+                       cl-defstruct pcase-defmacro))
            (macrop car)
 	   (setq expand (let ((load-file-name file)) (macroexpand form)))
 	   (memq (car expand) '(progn prog1 defalias)))
diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index 1ae7266624..05a4192dd9 100644
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -3006,6 +3006,7 @@ Supported keywords for slots are:
     `(progn
        (defvar ,tag-symbol)
        ,@(nreverse forms)
+       :autoload-end
        ;; Call cl-struct-define during compilation as well, so that
        ;; a subsequent cl-defstruct in the same file can correctly include this
        ;; struct as a parent.