Mercurial > emacs
changeset 100438:f2d8842e9574
* international/mule-cmds.el (select-safe-coding-system):
* mail/rmail.el (rmail-require-mime-maybe):
Fix arguments of `display-warning'.
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Mon, 15 Dec 2008 15:44:13 +0000 |
| parents | 3f79b3dad1ed |
| children | 5de002dfa264 |
| files | lisp/ChangeLog lisp/international/mule-cmds.el lisp/mail/rmail.el |
| diffstat | 3 files changed, 11 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon Dec 15 15:40:53 2008 +0000 +++ b/lisp/ChangeLog Mon Dec 15 15:44:13 2008 +0000 @@ -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'.
--- a/lisp/international/mule-cmds.el Mon Dec 15 15:40:53 2008 +0000 +++ b/lisp/international/mule-cmds.el Mon Dec 15 15:44:13 2008 +0000 @@ -855,14 +855,15 @@ (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))))))
--- a/lisp/mail/rmail.el Mon Dec 15 15:40:53 2008 +0000 +++ b/lisp/mail/rmail.el Mon Dec 15 15:44:13 2008 +0000 @@ -768,13 +768,14 @@ (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)))))