[Emacs-diffs] emacs/lisp/mail ChangeLog.pmail pmail.el

[Juanma Barranquero]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Juanma Barranquero <lektu>      08/12/15 15:40:53

Modified files:
        lisp/mail      : ChangeLog.pmail pmail.el 

Log message:
        * pmail.el (pmail-require-mime-maybe): Fix arguments of 
`display-warning'.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mail/ChangeLog.pmail?cvsroot=emacs&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mail/pmail.el?cvsroot=emacs&r1=1.31&r2=1.32

Patches:
Index: ChangeLog.pmail
===================================================================
RCS file: /sources/emacs/emacs/lisp/mail/ChangeLog.pmail,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- ChangeLog.pmail     15 Dec 2008 15:06:44 -0000      1.33
+++ ChangeLog.pmail     15 Dec 2008 15:40:53 -0000      1.34
@@ -1,3 +1,8 @@
+2008-12-15  Juanma Barranquero  <address@hidden>
+
+       * pmail.el (pmail-require-mime-maybe):
+       Fix arguments of `display-warning'.
+
 2008-12-15  Chong Yidong  <address@hidden>
 
        * pmail.el (pmail): Call pmail-swap-buffers-maybe.

Index: pmail.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/mail/pmail.el,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- pmail.el    15 Dec 2008 15:06:50 -0000      1.31
+++ pmail.el    15 Dec 2008 15:40:53 -0000      1.32
@@ -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))
+               pmail-mime-feature)
+       :warning)
        (setq pmail-enable-mime nil)))))