summaryrefslogtreecommitdiff
path: root/lisp/mail
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2013-05-21 00:25:14 -0700
committerGlenn Morris <rgm@gnu.org>2013-05-21 00:25:14 -0700
commitf440830d606632693e41c26890ba54f31c57b22a (patch)
treee46fe8a1c022ed8d282251599a404bc0fc2a61f2 /lisp/mail
parentdc2f2f9988c9931f563969de2b8d4dcc09835d2b (diff)
downloademacs-f440830d606632693e41c26890ba54f31c57b22a.tar.gz
Silence some compiler warnings
* calculator.el (electric, ehelp): No need to load when compiling. (Electric-command-loop, electric-describe-mode): Declare. * doc-view.el (doc-view-current-converter-processes): Move before use. * files.el (dired-unmark): * progmodes/gud.el (gdb-input): Update declarations. * emacs-lisp/easy-mmode.el (define-globalized-minor-mode): Move MODE-set-explicitly definition before use. * erc/erc-log.el (erc-network-name): Declare. * erc/erc-notify.el (pcomplete--here): Declare. (pcomplete/erc-mode/NOTIFY): Require pcomplete. * international/mule-diag.el (mule-diag): Don't use obsolete window-system-version. * mail/feedmail.el (smtpmail): No need to load when compiling. (smtpmail-via-smtp, smtpmail-smtp-server): Declare. * mail/mail-utils.el (rfc822): No need to load when compiling. (rfc822-addresses): Autoload it. (mail-strip-quoted-names): Trivial simplification. * mail/rmail.el (rmail-mime-message-p, rmail-mime-toggle-raw): Declare. (rmail-retry-failure): Don't assume that rmail-mime-feature == rmailmm. * net/snmp-mode.el (tempo): Don't duplicate requires. * progmodes/prolog.el (info): No need to load when compiling. (comint): Require before shell requires it. (Info-goto-node): Autoload it. (Info-follow-nearest-node): Declare. (prolog-help-info, prolog-goto-predicate-info): No need to require info. * textmodes/artist.el (picture-mode-exit): Declare. * textmodes/reftex-parse.el (reftex-parse-from-file): Trivial rewrite so the compiler can parse it better. * url/url-dav.el (url-http): Require it. (url-http-head-file-attributes): Don't autoload it. * url/url-proxy.el (url-http): Autoload it.
Diffstat (limited to 'lisp/mail')
-rw-r--r--lisp/mail/feedmail.el7
-rw-r--r--lisp/mail/mail-utils.el8
-rw-r--r--lisp/mail/rmail.el11
3 files changed, 17 insertions, 9 deletions
diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el
index 0502e7f9487..091b1a03025 100644
--- a/lisp/mail/feedmail.el
+++ b/lisp/mail/feedmail.el
@@ -370,9 +370,6 @@
(require 'mail-utils) ; pick up mail-strip-quoted-names
-(eval-when-compile
- (require 'smtpmail))
-
(autoload 'mail-do-fcc "sendmail")
(defgroup feedmail nil
@@ -1619,6 +1616,10 @@ local gurus."
;; These mean "report errors by mail" and "deliver in background".
(if (null mail-interactive) '("-oem" "-odb")))))
+(declare-function smtpmail-via-smtp "smtpmail"
+ (recipient smtpmail-text-buffer &optional ask-for-password))
+(defvar smtpmail-smtp-server)
+
;; provided by jam@austin.asc.slb.com (James A. McLaughlin);
;; simplified by WJC after more feedmail development;
;; idea (but not implementation) of copying smtpmail trace buffer to
diff --git a/lisp/mail/mail-utils.el b/lisp/mail/mail-utils.el
index 4b58016ebc6..0129d270db1 100644
--- a/lisp/mail/mail-utils.el
+++ b/lisp/mail/mail-utils.el
@@ -183,17 +183,15 @@ as Rmail does."
(error "Malformed MIME quoted-printable message"))))
(not failed))))))
-(eval-when-compile (require 'rfc822))
+(autoload 'rfc822-addresses "rfc822")
(defun mail-strip-quoted-names (address)
"Delete comments and quoted strings in an address list ADDRESS.
Also delete leading/trailing whitespace and replace FOO <BAR> with just BAR.
Return a modified address list."
- (if (null address)
- nil
+ (when address
(if mail-use-rfc822
- (progn (require 'rfc822)
- (mapconcat 'identity (rfc822-addresses address) ", "))
+ (mapconcat 'identity (rfc822-addresses address) ", ")
(let (pos)
;; Strip comments.
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 2a1d73faa65..af7ad220595 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -4105,6 +4105,9 @@ The message should be narrowed to just the headers."
(autoload 'mail-position-on-field "sendmail")
+(declare-function rmail-mime-message-p "rmailmm" ())
+(declare-function rmail-mime-toggle-raw "rmailmm" (&optional state))
+
(defun rmail-retry-failure ()
"Edit a mail message which is based on the contents of the current message.
For a message rejected by the mail system, extract the interesting headers and
@@ -4117,7 +4120,13 @@ The variable `rmail-retry-ignored-headers' is a regular expression
specifying headers which should not be copied into the new message."
(interactive)
(require 'mail-utils)
- (if rmail-enable-mime
+ ;; FIXME This does not handle rmail-mime-feature != 'rmailmm.
+ ;; There is no API defined for rmail-mime-feature to provide
+ ;; rmail-mime-message-p, rmail-mime-toggle-raw equivalents.
+ ;; But does anyone actually use rmail-mime-feature != 'rmailmm?
+ (if (and rmail-enable-mime
+ (eq rmail-mime-feature 'rmailmm)
+ (featurep rmail-mime-feature))
(with-current-buffer rmail-buffer
(if (rmail-mime-message-p)
(let ((rmail-mime-mbox-buffer rmail-view-buffer)