Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-77

Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 504-513)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - Update from CVS: .cvsignore: Add `lock'.

 * gnus--rel--5.10  (patch 99-103)

   - Update from CVS

diff --cc etc/NEWS
Simple merge

diff --cc lisp/ChangeLog
Simple merge

diff --cc lisp/cus-start.el
Simple merge

diff --cc lisp/desktop.el
Simple merge

diff --cc lisp/emacs-lisp/bytecomp.el
Simple merge

diff --cc lisp/emulation/keypad.el
Simple merge

diff --cc lisp/eshell/esh-mode.el
Simple merge

diff --cc lisp/eshell/esh-opt.el
Simple merge

diff --cc lisp/faces.el
Simple merge

diff --cc lisp/gnus/message.el
Simple merge

diff --cc lisp/gnus/mm-bodies.el
index 3e9766c3d412defdbd6b48e8b5f87056f11dcde3,23900d0cbec02c988aa54a730cb8fc8fde08979f..b4debfe718fa83f1860d34cb192201a845810b51
--- 1/lisp/gnus/mm-bodies.el
--- 2/lisp/gnus/mm-bodies.el
+++ b/lisp/gnus/mm-bodies.el
@@@ -95,10 -95,12 +95,11 @@@ If no encoding was done, nil is returne
      (save-excursion
        (if charset
          (progn
-           (mm-encode-coding-region (point-min) (point-max) charset)
+           (mm-encode-coding-region (point-min) (point-max)
+                                    (mm-charset-to-coding-system charset))
            charset)
        (goto-char (point-min))
 -      (let ((charsets (mm-find-mime-charset-region (point-min) (point-max)
 -                                                   mm-hack-charsets)))
 +      (let ((charsets (mm-find-mime-charset-region (point-min) (point-max))))
          (cond
           ;; No encoding.
           ((null charsets)

diff --cc lisp/gnus/mml.el
Simple merge

diff --cc lisp/progmodes/perl-mode.el
Simple merge

diff --cc lisp/simple.el
Simple merge

diff --cc lisp/term/mac-win.el
index 5c3f671e6e0c2f304932a5728f4358a3e9fee48e,1af90eb750ff118728c7ec9c84cc37a87cfa62d3..a95cccaeaad485e0a8c62dbc99f2cf30a98e0c12
--- 1/lisp/term/mac-win.el
--- 2/lisp/term/mac-win.el
+++ b/lisp/term/mac-win.el
@@@ -1,7 -1,7 +1,7 @@@
 -;;; mac-win.el --- parse switches controlling interface with Mac window system -*-coding: iso-2022-7bit;-*-
 +;;; mac-win.el --- parse switches controlling interface with Mac window system -*-coding: utf-8
  
- ;; Copyright (C) 1999, 2000, 2002, 2003, 2005
- ;;   Free Software Foundation, Inc.
+ ;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
+ ;;   2005 Free Software Foundation, Inc.
  
  ;; Author: Andrew Choi <akochoi@mac.com>
  ;; Keywords: terminals

diff --cc lisp/term/w32-win.el
Simple merge

diff --cc lisp/term/x-win.el
Simple merge

diff --cc src/ChangeLog
Simple merge

diff --cc src/frame.c
Simple merge

diff --cc src/xdisp.c
Simple merge