* international/mule-cmds.el (select-safe-coding-system):

* mail/rmail.el (rmail-require-mime-maybe):
  Fix arguments of `display-warning'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b39aecfc05e3a222c0b254fe236ce0930bbff274..63a5e921326e50f75931bb813b142a6d41465122 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,10 @@
 
        * international/mule.el (find-auto-coding): Fix typo in docstring.
 
+       * international/mule-cmds.el (select-safe-coding-system):
+       * mail/rmail.el (rmail-require-mime-maybe):
+       Fix arguments of `display-warning'.
+
        * simple.el (bad-package-check): Fix arguments of `display-warning',
        using the package name as TYPE.  Use `string-match-p'.
 

diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 9222b19c3845b7e98e7c7657fb58473d07dbdec5..3afc512952b0b496867b3f1b49d91b344b7e02dc 100644 (file)
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -855,14 +855,15 @@ and TO is ignored."
              (if (coding-system-p (car auto-cs))
                  (setq auto-cs (car auto-cs))
                (display-warning
-                :warning
+                'mule
                 (format "\
 Invalid coding system `%s' is specified
 for the current buffer/file by the %s.
 It is highly recommended to fix it before writing to a file."
                         (car auto-cs)
                         (if (eq (cdr auto-cs) :coding) ":coding tag"
-                          (format "variable `%s'" (cdr auto-cs)))))
+                          (format "variable `%s'" (cdr auto-cs))))
+                :warning)
                (or (yes-or-no-p "Really proceed with writing? ")
                    (error "Save aborted"))
                (setq auto-cs nil))))))

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 6e3056da4074bef773adcaa5e2be44e9444ff53f..795cbfcf6aae60030f91f5052e4bb8cfd1300f94 100644 (file)
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -768,13 +768,14 @@ isn't provided."
        (require rmail-mime-feature)
       (error
        (display-warning
-       :warning
+       'rmail
        (format "Although MIME support is requested
 by setting `rmail-enable-mime' to non-nil, the required feature
 `%s' (the value of `rmail-mime-feature')
 is not available in the current session.
-So, the MIME support is turned off for the moment." 
-               rmail-mime-feature))
+So, the MIME support is turned off for the moment."
+               rmail-mime-feature)
+       :warning)
        (setq rmail-enable-mime nil)))))