Convert Emacs article buffers from widget.el to button.el

* lisp/gnus/gnus-art.el (gnus-mime-button-map)
(gnus-url-button-commands, gnus-insert-mime-button)
(gnus-mime-display-alternative)
(gnus-article-extend-url-button, gnus-article-add-button)
(gnus-insert-prev-page-button, gnus-insert-next-page-button)
(gnus-mime-security-button-map)
(gnus-insert-mime-security-button): Ditto.

* lisp/gnus/gnus-html.el (gnus-html-displayed-image-map)
(gnus-html-wash-images, gnus-html-put-image): Ditto.

* lisp/gnus/gnus-icalendar.el (gnus-icalendar-insert-button): Ditto.

* lisp/gnus/gnus-sum.el (gnus-summary-widget-forward)
(gnus-summary-button-forward, gnus-summary-widget-backward)
(gnus-summary-button-backward, gnus-collect-urls-primary-text)
(gnus-collect-urls, gnus-summary-browse-url): Stop using widgets
and star using button.el buttons instead.

* lisp/gnus/mm-decode.el (mm-shr, mm-handle-filename): Don't
convert shr buttons into widgets.

1 files changed, 13 insertions, 23 deletions

diff --git a/lisp/gnus/gnus-html.el b/lisp/gnus/gnus-html.el
index f36c3897876..92d760f4bf7 100644
--- a/lisp/gnus/gnus-html.el
+++ b/lisp/gnus/gnus-html.el
@@ -84,7 +84,7 @@ fit these criteria."
     (define-key map "i" 'gnus-html-browse-image)
     (define-key map "\r" 'gnus-html-browse-url)
     (define-key map "u" 'gnus-article-copy-string)
-    (define-key map [tab] 'widget-forward)
+    (define-key map [tab] 'button-forward)
     map))
 
 (defun gnus-html-encode-url (url)
@@ -180,12 +180,10 @@ fit these criteria."
 	       'image-displayer `(lambda (url start end)
 				   (gnus-html-display-image url start end
 							    ,alt-text))
+	       'help-echo alt-text
+	       'button t
+	       'keymap gnus-html-image-map
 	       'gnus-image (list url start end alt-text)))
-	(widget-convert-button
-	 'url-link start (point)
-	 :help-echo alt-text
-	 :keymap gnus-html-image-map
-	 url)
 	(if (string-match "\\`cid:" url)
 	    ;; URLs with cid: have their content stashed in other
 	    ;; parts of the MIME structure, so just insert them
@@ -207,21 +205,15 @@ fit these criteria."
 				      (delete-region start end))
 				    "*")
 		    'cid))
-		(widget-convert-button
-		 'link start end
-		 :action 'gnus-html-insert-image
-		 :help-echo url
-		 :keymap gnus-html-image-map
-		 :button-keymap gnus-html-image-map)))
+		(make-text-button start end
+				  'help-echo url
+				  'keymap gnus-html-image-map)))
 	  ;; Normal, external URL.
 	  (if (or inhibit-images
 		  (gnus-html-image-url-blocked-p url blocked-images))
-	      (widget-convert-button
-	       'link start end
-	       :action 'gnus-html-insert-image
-	       :help-echo url
-	       :keymap gnus-html-image-map
-	       :button-keymap gnus-html-image-map)
+	      (make-text-button start end
+				'help-echo url
+				'keymap gnus-html-image-map)
 	    ;; Non-blocked url
 	    (let ((width
 		   (when (string-match "width=\"?\\([0-9]+\\)" parameters)
@@ -444,11 +436,9 @@ Return a string with image data."
                   (let ((image (gnus-rescale-image image (gnus-html-maximum-image-size))))
                     (delete-region start end)
                     (gnus-put-image image alt-text 'external)
-		    (widget-convert-button
-		     'url-link start (point)
-		     :help-echo alt-text
-		     :keymap gnus-html-displayed-image-map
-		     url)
+		    (make-text-button start (point)
+				      'help-echo alt-text
+				      'keymap gnus-html-displayed-image-map)
                     (put-text-property start (point) 'gnus-alt-text alt-text)
                     (when url
 		      (add-text-properties