lisp/gnus/gnus-art.el (gnus-mm-display-part): Highlight header attachment buttons

2 files changed, 24 insertions, 7 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 7d880016ad7..628ccf3b272 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-01  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus-art.el (gnus-mm-display-part):
+        Highlight header attachment buttons.
+
 2014-04-30  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * gnus-art.el (gnus-mm-display-part): Don't move point while toggling
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 951ee908a54..44777f461e9 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -5673,15 +5673,27 @@ all parts."
                  (mm-handle-media-type handle))))))
       (goto-char point)
       ;; Toggle the button appearance between `[button]...' and `[button]'.
-      (let ((end (next-single-property-change point 'gnus-data)))
-        (delete-region (previous-single-property-change end 'gnus-data) end))
-      (gnus-insert-mime-button
-       handle id (list (mm-handle-displayed-p handle)))
-      (let ((pt (point)))
+      (let ((end (next-single-property-change point 'gnus-data))
+            start)
+        (delete-region
+         (setq start (previous-single-property-change end 'gnus-data))
+         end)
+        (gnus-insert-mime-button
+         handle id (list (mm-handle-displayed-p handle)))
+        (setq end (point))
         (if (search-backward "\n\n" nil t)
-            (goto-char pt)
+            (goto-char end)
           ;; We're in the article header.
-          (delete-char -1)))
+          (delete-char -1)
+          (dolist (ovl (gnus-overlays-in start (1- end)))
+            (gnus-overlay-put ovl 'gnus-button-attachment-extra t)
+            (gnus-overlay-put ovl 'face nil))
+          (save-restriction
+            (message-narrow-to-field)
+            (let ((gnus-treatment-function-alist
+                   '((gnus-treat-highlight-headers
+                      gnus-article-highlight-headers))))
+              (gnus-treat-article 'head)))))
       (goto-char point)
       (if (window-live-p window)
           (select-window window)))