# HG changeset patch
# User Juanma Barranquero <lekktu@gmail.com>
# Date 1229355653 0
# Node ID 3f79b3dad1ed61bd46db7192f6f23217f2051f7c
# Parent  a86104b93aaa93fee0b9c5bc05061be0e6f19d12
* pmail.el (pmail-require-mime-maybe): Fix arguments of `display-warning'.

diff -r a86104b93aaa -r 3f79b3dad1ed lisp/mail/ChangeLog.pmail
--- a/lisp/mail/ChangeLog.pmail	Mon Dec 15 15:22:48 2008 +0000
+++ b/lisp/mail/ChangeLog.pmail	Mon Dec 15 15:40:53 2008 +0000
@@ -1,3 +1,8 @@
+2008-12-15  Juanma Barranquero  <lekktu@gmail.com>
+
+	* pmail.el (pmail-require-mime-maybe):
+	Fix arguments of `display-warning'.
+
 2008-12-15  Chong Yidong  <cyd@stupidchicken.com>
 
 	* pmail.el (pmail): Call pmail-swap-buffers-maybe.
diff -r a86104b93aaa -r 3f79b3dad1ed lisp/mail/pmail.el
--- a/lisp/mail/pmail.el	Mon Dec 15 15:22:48 2008 +0000
+++ b/lisp/mail/pmail.el	Mon Dec 15 15:40:53 2008 +0000
@@ -824,13 +824,14 @@
 	(require pmail-mime-feature)
       (error
        (display-warning
-	:warning
+	'pmail
 	(format "Although MIME support is requested
 by setting `pmail-enable-mime' to non-nil, the required feature
 `%s' (the value of `pmail-mime-feature')
 is not available in the current session.
-So, the MIME support is turned off for the moment." 
-		pmail-mime-feature))
+So, the MIME support is turned off for the moment."
+		pmail-mime-feature)
+	:warning)
        (setq pmail-enable-mime nil)))))
 
 
@@ -1683,7 +1684,7 @@
 	(when spam-filter-p
 	  (if rsf-beep (beep t))
 	  (sleep-for rsf-sleep-after-message))
-    
+
 	;; Establish the return value and move to the first new
 	;; message unless we have other unseen messages before it.
 	(setq result (> new-messages 0))
@@ -1751,7 +1752,7 @@
 	  ;; The password is embedded.  Strip it out since movemail
 	  ;; does not really like it, in spite of the movemail spec.
 	  (setq file (concat proto "://" user "@" host)))
- 
+
 	(if (pmail-movemail-variant-p 'emacs)
 	    (if (string-equal proto "pop")
 		(list (concat "po:" user ":" host)
@@ -1943,7 +1944,7 @@
   (goto-char (point-max))
   (forward-char -1)
   (insert name ": " value "\n"))
-  
+
 (defun pmail-add-mbox-headers ()
   "Validate the RFC2822 format for the new messages.
 Point should be at the first new message.
@@ -2072,7 +2073,7 @@
 		(narrow-to-region beg end)
 		(mail-fetch-field name))
 	    (pmail-error-bad-format msg)))))))
-  
+
 (defun pmail-get-attr-names (&optional msg)
   "Return the message attributes in a comma separated string.
 MSG, if set identifies the message number to use.  The current