[Emacs-diffs] /srv/bzr/emacs/trunk r104227: * lisp/mail/feedmail.el (bbdb-dwim-net-address, vm-mail): Declare.

[Glenn Morris]

------------------------------------------------------------
revno: 104227
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2011-05-14 11:47:29 -0700
message:
  * lisp/mail/feedmail.el (bbdb-dwim-net-address, vm-mail): Declare.
modified:
  lisp/ChangeLog
  lisp/mail/feedmail.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-05-14 18:43:43 +0000
+++ b/lisp/ChangeLog    2011-05-14 18:47:29 +0000
@@ -5,7 +5,8 @@
        (feedmail-queue-slug-suspect-regexp, feedmail-debug)
        (feedmail-debug-sit-for, feedmail-queue-express-hook)
        (feedmail-queue-runner-message-sender): Set :version.
-       (bbdb-search, bbdb-records, smtp-via-smtp, smtp-server): Declare.
+       (bbdb-search, bbdb-records, smtp-via-smtp, smtp-server)
+       (bbdb-dwim-net-address, vm-mail): Declare.
        (feedmail-binmail-gnulinuxish-template):
        Rename from feedmail-binmail-linuxish-template.
        (feedmail-buffer-to-smtp, feedmail-vm-mail-mode):

=== modified file 'lisp/mail/feedmail.el'
--- a/lisp/mail/feedmail.el     2011-05-14 18:43:43 +0000
+++ b/lisp/mail/feedmail.el     2011-05-14 18:47:29 +0000
@@ -914,9 +914,9 @@
 ;; FIXME this is a macro?
 (declare-function bbdb-search "ext:bbdb-com"
                  (records &optional name company net notes phone))
-
 (declare-function bbdb-records "ext:bbdb"
                  (&optional dont-check-disk already-in-db-buffer))
+(declare-function bbdb-dwim-net-address "ext:bbdb-com" (record &optional net))
 
 (defun feedmail-spray-via-bbdb ()
   "Example function for use with feedmail spray mode.
@@ -1733,6 +1733,8 @@
 non-nil, feedmail \"smart filling\" is done on VALUE just before
 insertion.")
 
+(declare-function vm-mail "ext:vm" (&optional to subject))
+
 (defun feedmail-vm-mail-mode (&optional arg)
   "Make something like a buffer that has been created via `vm-mail'.
 The optional argument is ignored and is just for argument compatibility with