Commit 2364df5c authored by Juanma Barranquero's avatar Juanma Barranquero

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

* mail/rmail.el (rmail-require-mime-maybe):
  Fix arguments of `display-warning'.
parent 6d49b2d8
......@@ -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'.
......
......@@ -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))))))
......
......@@ -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)))))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment