From 209e8bd102ac65bf5ae1a4aad56d21a097536f9a Mon Sep 17 00:00:00 2001
From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Fri, 12 Feb 2016 17:28:10 +1100
Subject: [PATCH] Fix various compilation warnings in message.el

* lisp/gnus/message.el (message-fix-before-sending): Use
read-multiple-choice instead of gnus-multiple-choice.
(mm-util): Require.
(rfc2047): Require.
(message-remove-blank-cited-lines): Use message instead of
gnus-message.
(message-send): Use y-or-n-p instead of gnus-y-or-n-p.
---
 lisp/gnus/message.el | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index dec4c379adb..7cf5019ec50 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -46,6 +46,8 @@
 (require 'rfc822)
 (require 'format-spec)
 (require 'dired)
+(require 'mm-util)
+(require 'rfc2047)
 
 (autoload 'mailclient-send-it "mailclient") ;; Emacs 22 or contrib/
 
@@ -3764,7 +3766,7 @@ To use this automatically, you may add this function to
 	  message-yank-prefix
 	  "\\)+ *\n"
 	  )))
-    (gnus-message 8 "removing `%s'" citexp)
+    (message "removing `%s'" citexp)
     (save-excursion
       (message-goto-body)
       (while (re-search-forward citexp nil t)
@@ -4185,7 +4187,7 @@ It should typically alter the sending method in some way or other."
 		    (or (eq message-allow-no-recipients 'always)
 			(and (not (eq message-allow-no-recipients 'never))
 			     (setq dont-barf-on-no-method
-				   (gnus-y-or-n-p
+				   (y-or-n-p
 				    (format "No receiver, perform %s anyway? "
 					    (cond ((and fcc gcc) "Fcc and Gcc")
 						  (fcc "Fcc")
@@ -4333,16 +4335,18 @@ conformance."
 	(forward-char))
       (when found
 	(setq choice
-	      (gnus-multiple-choice
-	       (if nul-chars
-		   "NUL characters found, which may cause problems.  Continue sending?"
-		 "Non-printable characters found.  Continue sending?")
-	       `((?d "Remove non-printable characters and send")
-		 (?r ,(format
-		       "Replace non-printable characters with \"%s\" and send"
-		       message-replacement-char))
-		 (?s "Send as is without removing anything")
-		 (?e "Continue editing"))))
+	      (car
+	       (read-multiple-choice
+		(if nul-chars
+		    "NUL characters found, which may cause problems.  Continue sending?"
+		  "Non-printable characters found.  Continue sending?")
+		`((?d "delete" "Remove non-printable characters and send")
+		  (?r "replace"
+		      ,(format
+			"Replace non-printable characters with \"%s\" and send"
+			message-replacement-char))
+		  (?s "send" "Send as is without removing anything")
+		  (?e "edit" "Continue editing")))))
 	(if (eq choice ?e)
 	  (error "Non-printable characters"))
 	(message-goto-body)
-- 
2.39.2