[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/lisp ChangeLog international/mule-cmds.el...
From: |
Juanma Barranquero |
Subject: |
[Emacs-diffs] emacs/lisp ChangeLog international/mule-cmds.el... |
Date: |
Mon, 15 Dec 2008 15:44:16 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Juanma Barranquero <lektu> 08/12/15 15:44:16
Modified files:
lisp : ChangeLog
lisp/international: mule-cmds.el
lisp/mail : rmail.el
Log message:
* international/mule-cmds.el (select-safe-coding-system):
* mail/rmail.el (rmail-require-mime-maybe):
Fix arguments of `display-warning'.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.14949&r2=1.14950
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/international/mule-cmds.el?cvsroot=emacs&r1=1.348&r2=1.349
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mail/rmail.el?cvsroot=emacs&r1=1.455&r2=1.456
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.14949
retrieving revision 1.14950
diff -u -b -r1.14949 -r1.14950
--- ChangeLog 15 Dec 2008 15:22:48 -0000 1.14949
+++ ChangeLog 15 Dec 2008 15:44:13 -0000 1.14950
@@ -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'.
Index: international/mule-cmds.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/international/mule-cmds.el,v
retrieving revision 1.348
retrieving revision 1.349
diff -u -b -r1.348 -r1.349
--- international/mule-cmds.el 1 Dec 2008 11:07:44 -0000 1.348
+++ international/mule-cmds.el 15 Dec 2008 15:44:15 -0000 1.349
@@ -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))))))
Index: mail/rmail.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/mail/rmail.el,v
retrieving revision 1.455
retrieving revision 1.456
diff -u -b -r1.455 -r1.456
--- mail/rmail.el 21 Aug 2008 12:24:48 -0000 1.455
+++ mail/rmail.el 15 Dec 2008 15:44:15 -0000 1.456
@@ -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))
+ rmail-mime-feature)
+ :warning)
(setq rmail-enable-mime nil)))))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs/lisp ChangeLog international/mule-cmds.el...,
Juanma Barranquero <=