Merge from emacs--rel--22

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1032

3 files changed, 15 insertions, 6 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fe3ef875f01..d4d4b0861d9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2008-02-01  Jason Rumney  <jasonr@gnu.org>
+
+        * w32-fns.el: Partially revert 2007-11-10 change.
+
+2008-02-01  Martin Rudalics  <rudalics@gmx.at>
+
+        * mail/rmail.el (rmail-highlight): Fix specification.
+        Reported by: pod <pod@herald.ox.ac.uk>.
+
 2008-02-01  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * image-mode.el (image-mode-current-vscroll)
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index e11e7dfe912..430c7936c9f 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -332,7 +332,7 @@ See also `rmail-highlight-face'."
   :group 'rmail-headers)
 
 (defface rmail-highlight
-  '((t :default highlight))
+  '((t (:inherit highlight)))
   "Face to use for highlighting the most important header fields."
   :group 'rmail-headers
   :version "22.1")
diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el
index ce1107fe6c1..d2cf650b3ae 100644
--- a/lisp/w32-fns.el
+++ b/lisp/w32-fns.el
@@ -377,9 +377,9 @@ bit output with no translation."
 (w32-add-charset-info "jisx0201-latin" 'w32-charset-shiftjis 932)
 (w32-add-charset-info "jisx0201-katakana" 'w32-charset-shiftjis 932)
 (w32-add-charset-info "jisx0208-sjis" 'w32-charset-shiftjis 932)
-(w32-add-charset-info "ksc5601.1989-1" 'w32-charset-hangeul 949)
-(w32-add-charset-info "big5-1" 'w32-charset-chinesebig5 950)
-(w32-add-charset-info "gb2312.1980-1" 'w32-charset-gb2312 936)
+(w32-add-charset-info "ksc5601.1989" 'w32-charset-hangeul 949)
+(w32-add-charset-info "big5" 'w32-charset-chinesebig5 950)
+(w32-add-charset-info "gb2312.1980" 'w32-charset-gb2312 936)
 (w32-add-charset-info "ms-symbol" 'w32-charset-symbol nil)
 (w32-add-charset-info "ms-oem" 'w32-charset-oem 437)
 (w32-add-charset-info "ms-oemlatin" 'w32-charset-oem 850)
@@ -395,8 +395,8 @@ bit output with no translation."
       (w32-add-charset-info "iso8859-13" 'w32-charset-baltic 1257)
       (w32-add-charset-info "koi8-r" 'w32-charset-russian 20866)
       (w32-add-charset-info "iso8859-5" 'w32-charset-russian 28595)
-      (w32-add-charset-info "tis620-1" 'w32-charset-thai 874)
-      (w32-add-charset-info "ksc5601.1992-1" 'w32-charset-johab 1361)
+      (w32-add-charset-info "tis620" 'w32-charset-thai 874)
+      (w32-add-charset-info "ksc5601.1992" 'w32-charset-johab 1361)
       (w32-add-charset-info "mac-latin" 'w32-charset-mac nil)))
 (if (boundp 'w32-unicode-charset-defined)
     (progn