branch: elpa/vm
commit 018ca8337a9a10f28236165df94d824350fd176b
Author: Mark Diekhans <[email protected]>
Commit: Mark Diekhans <[email protected]>
Fix byte-compile warnings in vm-imap, vm-pop, vm-postpone, vm-rfaddons,
vm-vcard
Fixes vm#517.
- vm-imap.el: Uncomment mailbox assignment (was used but uninitialized),
add defvar for auth-sources to fix dynamic binding warning,
initialize flags to nil
- vm-pop.el: Add defvar for auth-sources to fix dynamic binding warning
- vm-postpone.el: Change defcustom :type from 'list to 'sexp
- vm-rfaddons.el: Prefix unused sit-for argument with underscore,
replace obsolete vm-mime-qp-decode-region with
quoted-printable-decode-region
- vm-vcard.el: Add defvar for vcard-pretty-print-function to fix
dynamic binding warning
---
lisp/vm-imap.el | 5 +++--
lisp/vm-pop.el | 6 ++++--
lisp/vm-postpone.el | 4 ++--
lisp/vm-rfaddons.el | 4 ++--
lisp/vm-vcard.el | 2 ++
5 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/lisp/vm-imap.el b/lisp/vm-imap.el
index 1c9f55f28b..96c00bcfad 100644
--- a/lisp/vm-imap.el
+++ b/lisp/vm-imap.el
@@ -45,6 +45,7 @@
;; (retry nil)))
(defvar selectable-only) ;; FIXME: Add `vm-' prefix!
+(defvar auth-sources) ;; from auth-source.el, used for dynamic binding
;;; To-Do (USR)
;; - Need to ensure that new imap sessions get created as and when needed.
@@ -1175,7 +1176,7 @@ Returns the process or nil if the session could not be
created."
protocol (car source-list)
host (nth 1 source-list)
port (nth 2 source-list)
- ;; mailbox (nth 3 source-list)
+ mailbox (nth 3 source-list)
auth (nth 4 source-list)
user (nth 5 source-list)
pass (nth 6 source-list)
@@ -4667,7 +4668,7 @@ May throw exceptions."
(mailboxes nil)
(fcc-string (vm-mail-get-header-contents "FCC:" ","))
fcc-list fcc maildrop spec-list
- process flags string m ;; response
+ process (flags nil) string m ;; response
(vm-imap-ok-to-ask t))
(if (null mailbox)
(setq mailboxes nil)
diff --git a/lisp/vm-pop.el b/lisp/vm-pop.el
index f91a173587..50a4bb713b 100644
--- a/lisp/vm-pop.el
+++ b/lisp/vm-pop.el
@@ -32,11 +32,13 @@
(require 'vm-mime)
(eval-when-compile (require 'cl-lib))
-(declare-function vm-submit-bug-report
+(declare-function vm-submit-bug-report
"vm.el" (&optional pre-hooks post-hooks))
-(declare-function open-network-stream
+(declare-function open-network-stream
"subr.el" (name buffer host service &rest parameters))
+(defvar auth-sources) ;; from auth-source.el, used for dynamic binding
+
(if (fboundp 'define-error)
(progn
(define-error 'vm-cant-uidl "Can't use UIDL")
diff --git a/lisp/vm-postpone.el b/lisp/vm-postpone.el
index 532589d7bb..8c2af34a53 100644
--- a/lisp/vm-postpone.el
+++ b/lisp/vm-postpone.el
@@ -941,7 +941,7 @@ See the variable `vm-mail-priority'."
vm-auto-folder-alist)
"Like `vm-auto-folder-alist' but for outgoing messages.
It should be fed to `vm-mail-select-folder'."
- :type 'list
+ :type 'sexp
:group 'vm-postpone)
;;;###autoload
@@ -954,7 +954,7 @@ By reordering the elements of this list or adding own
functions you
can control the behavior of vm-mail-fcc and `vm-mail-auto-fcc'.
You may allow a sophisticated decision for the right folder for your
outgoing message."
- :type 'list
+ :type 'sexp
:group 'vm-postpone)
;;;###autoload
diff --git a/lisp/vm-rfaddons.el b/lisp/vm-rfaddons.el
index fd27eff411..ef04919476 100644
--- a/lisp/vm-rfaddons.el
+++ b/lisp/vm-rfaddons.el
@@ -146,7 +146,7 @@ nil. (Rob F)"
(vm-mime-auto-save-all-attachments-delete-external m)))
;;;###autoload
-(defun vm-rfaddons-infect-vm (&optional sit-for
+(defun vm-rfaddons-infect-vm (&optional _sit-for
option-list exclude-option-list)
"This function will setup the key bindings, advices and hooks
necessary to use all the function of vm-rfaddons.el.
@@ -1388,7 +1388,7 @@ text/alternative message depending on the value of the
variable
(setq end (point-marker))
(insert "--" boundary "--\n")))
- (if qp-encoded (vm-mime-qp-decode-region start end))
+ (if qp-encoded (quoted-printable-decode-region start end))
(goto-char body)
(if (stringp vm-assimilate-html-command)
diff --git a/lisp/vm-vcard.el b/lisp/vm-vcard.el
index 0acd0e654f..ade2593055 100644
--- a/lisp/vm-vcard.el
+++ b/lisp/vm-vcard.el
@@ -34,6 +34,8 @@
(require 'vm-misc)
(vm-load-features-silent-when-compiling '(vcard)))
+(defvar vcard-pretty-print-function) ;; from vcard.el, used for dynamic
binding
+
(and (boundp 'vcard-api-version) (string-lessp vcard-api-version "2.0")
(error "vm-vcard.el requires vcard API version 2.0 or later."))
