diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2008-12-15 15:44:13 +0000 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2008-12-15 15:44:13 +0000 |
| commit | 2364df5cff35f460f385889cc1ad6cf3141bb520 (patch) | |
| tree | d2ef41d131deaa915ce350c031d447e8bcebb021 /lisp | |
| parent | 6d49b2d88f39d9b1b34c7598fa06c29c1bce3346 (diff) | |
| download | emacs-2364df5cff35f460f385889cc1ad6cf3141bb520.tar.gz | |
* international/mule-cmds.el (select-safe-coding-system):
* mail/rmail.el (rmail-require-mime-maybe):
Fix arguments of `display-warning'.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/international/mule-cmds.el | 5 | ||||
| -rw-r--r-- | lisp/mail/rmail.el | 7 |
3 files changed, 11 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b39aecfc05e..63a5e921326 100644 --- 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 9222b19c384..3afc512952b 100644 --- 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 6e3056da407..795cbfcf6aa 100644 --- 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))))) |