[nongnu] elpa/vm b31b4ec294 16/20: Silence misc warnings

[ELPA Syncer]

branch: elpa/vm
commit b31b4ec294e3afc176412fb901bd659b23b9f3c2
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>

    Silence misc warnings
---
 lisp/vm-mime.el    | 39 ++++++++++++++++++++-------------------
 lisp/vm-pgg.el     |  7 ++++---
 lisp/vm-summary.el |  5 +++++
 3 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/lisp/vm-mime.el b/lisp/vm-mime.el
index b1acbb18aa..da65286ac2 100644
--- a/lisp/vm-mime.el
+++ b/lisp/vm-mime.el
@@ -3540,24 +3540,23 @@ it to an internal object by retrieving the body.       
USR, 2011-03-28"
                   (vm-make-multibyte-work-buffer
                    (format "*%s mime object*"
                            (car (vm-mm-layout-type child-layout))))))
-            (unwind-protect
-                (let (oldsize)
-                  (with-current-buffer work-buffer
-                    (vm-mime-retrieve-external-body layout))
-                  (goto-char (vm-mm-layout-body-start child-layout))
-                  (setq oldsize (buffer-size))
-                  (condition-case data
-                      (insert-buffer-substring work-buffer)
-                    (error (signal 'vm-mime-error (cdr data))))
-                  ;; This is redundant because insertion moves point
-                  ;; (goto-char (+ (point) (- (buffer-size) oldsize)))
-                  (if (< (point) (vm-mm-layout-body-end child-layout))
-                      (delete-region (point)
-                                     (vm-mm-layout-body-end child-layout))
-                    (vm-set-mm-layout-body-end child-layout (point-marker)))
-                  (delete-region (vm-mm-layout-header-start layout)
-                                 (vm-mm-layout-body-start layout))
-                  (vm-mime-copy-layout child-layout layout)))
+            (let (oldsize)
+              (with-current-buffer work-buffer
+                (vm-mime-retrieve-external-body layout))
+              (goto-char (vm-mm-layout-body-start child-layout))
+              (setq oldsize (buffer-size))
+              (condition-case data
+                  (insert-buffer-substring work-buffer)
+                (error (signal 'vm-mime-error (cdr data))))
+              ;; This is redundant because insertion moves point
+              ;; (goto-char (+ (point) (- (buffer-size) oldsize)))
+              (if (< (point) (vm-mm-layout-body-end child-layout))
+                  (delete-region (point)
+                                 (vm-mm-layout-body-end child-layout))
+                (vm-set-mm-layout-body-end child-layout (point-marker)))
+              (delete-region (vm-mm-layout-header-start layout)
+                             (vm-mm-layout-body-start layout))
+              (vm-mime-copy-layout child-layout layout))
             (when work-buffer (kill-buffer work-buffer)))))
        ((vm-mime-composite-type-p (car (vm-mm-layout-type layout)))
         (let ((p (vm-mm-layout-parts layout)))
@@ -6196,7 +6195,9 @@ there is no file name for this object.             USR, 
2011-03-07"
         ;; either vm-mime-forward-local-external-bodies is t
         ;; or vm-mime-forward-saved-attachments is nil
        ;; Otherwise, expand the external-body parts
-       (fb (list (or vm-mime-forward-local-external-bodies
+       (fb (list (or (with-suppressed-warnings
+                         ((obsolete vm-mime-forward-local-external-bodies))
+                       vm-mime-forward-local-external-bodies)
                      (not vm-mime-forward-saved-attachments)))))
     (cond ((and (stringp object) (not mimed))
           (if (or (vm-mime-types-match "application" type)
diff --git a/lisp/vm-pgg.el b/lisp/vm-pgg.el
index e8c673b6d6..35ca9bc7f1 100644
--- a/lisp/vm-pgg.el
+++ b/lisp/vm-pgg.el
@@ -299,9 +299,10 @@ Switch mode on/off according to ARG.
   (setq vm-pgg-compose-mode
        (if (null arg) (not vm-pgg-compose-mode)
          (> (prefix-numeric-value arg) 0)))
-  (if vm-pgg-compose-mode
-      (easy-menu-add vm-pgg-compose-mode-menu)
-    (easy-menu-remove vm-pgg-compose-mode-menu)))
+  (when (featurep 'xemacs)
+    (if vm-pgg-compose-mode
+        (easy-menu-add vm-pgg-compose-mode-menu)
+      (easy-menu-remove vm-pgg-compose-mode-menu))))
 
 (defvar vm-pgg-compose-mode-string " vm-pgg"
   "*String to put in mode line when function `vm-pgg-compose-mode' is active.")
diff --git a/lisp/vm-summary.el b/lisp/vm-summary.el
index 0d03221b15..9425e1f006 100644
--- a/lisp/vm-summary.el
+++ b/lisp/vm-summary.el
@@ -2051,6 +2051,11 @@ Call this function if you made changes to 
`vm-summary-format'."
                 (file-truename
                  (expand-file-name folder (or dir vm-folder-directory)))))))
 
+(declare-function open-database  "ext:berkeley-db")
+(declare-function close-database "ext:berkeley-db")
+(declare-function put-database   "ext:berkeley-db")
+(declare-function get-database   "ext:berkeley-db")
+
 (defun vm-open-folders-summary-database (mode)
   (condition-case data
       (open-database vm-folders-summary-database 'berkeley-db 'hash mode)