Merged from miles@gnu.org--gnu-2005 (patch 37-38, 162-182)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-162
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-163
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-164
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-165
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-166
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-167
   Tweak obsolete function/variable warning message

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-168
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-169
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-170
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-171
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-172
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-173
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-174
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-175
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-176
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-177
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-178
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-179
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-180
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-181
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-182
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-37
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-38
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-309

diff --cc etc/TODO
Simple merge

diff --cc lisp/bindings.el
Simple merge

diff --cc lisp/faces.el
Simple merge

diff --cc lisp/international/mule-cmds.el
index 24992b3c10b9715e5db95d3d4dfa7240999a8428,a06c438b421df4f9afd72a984390abef4398abfd..3fac3ab6dd932fbab9bc8ceb63a65b1cd47c8fe9
--- 1/lisp/international/mule-cmds.el
--- 2/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@@ -2460,14 -2418,23 +2498,19 @@@ See also `locale-charset-language-names
            (charset-language-name
             (locale-name-match locale locale-charset-language-names))
            (coding-system
 -           (or (locale-name-match locale locale-preferred-coding-systems)
 -               (when locale
 -                 (if (string-match "\\.\\([^@]+\\)" locale)
 -                     (locale-charset-to-coding-system
 -                      (match-string 1 locale)))))))
 +           (get-locale-coding-system locale)))
  
-       ;; Give preference to charset-language-name over language-name.
-       (if (and charset-language-name
-                (not
-                 (equal (get-language-info language-name 'charset)
-                        (get-language-info charset-language-name 'charset))))
-           (setq language-name charset-language-name))
+       (if (consp language-name)
+           ;; locale-language-names specify both lang-env and coding.
+           ;; But, what specified in locale-preferred-coding-systems
+           ;; has higher priority.
+           (setq coding-system (or coding-system
+                                   (nth 1 language-name))
+                 language-name (car language-name))
+         ;; Otherwise, if locale is not listed in locale-language-names,
+         ;; use what listed in locale-charset-language-names.
+         (if (not language-name)
+             (setq language-name charset-language-name)))
  
        (when language-name
  

diff --cc lisp/progmodes/gdb-ui.el
Simple merge

diff --cc lisp/simple.el
index d0d5f9f017094e3eea55e9d270a668157eda6de4,28b62a270980298e4e999bbece11ce93ef8e503b..99e826a6d18558e0faa80f6ded431ac8b1566f80
--- 1/lisp/simple.el
--- 2/lisp/simple.el
+++ b/lisp/simple.el
@@@ -5068,7 -5069,8 +5073,8 @@@ the front of the list of recently selec
  (defcustom normal-erase-is-backspace
    (and (not noninteractive)
         (or (memq system-type '(ms-dos windows-nt))
 -         (eq window-system 'mac)
 -         (and (memq window-system '(x))
++         (eq initial-window-system 'mac)
 +         (and (memq initial-window-system '(x))
                (fboundp 'x-backspace-delete-keys-p)
                (x-backspace-delete-keys-p))
           ;; If the terminal Emacs is running on has erase char

diff --cc lisp/subr.el
Simple merge

diff --cc src/coding.c
Simple merge

diff --cc src/dispextern.h
Simple merge

diff --cc src/fileio.c
Simple merge

diff --cc src/fontset.c
Simple merge

diff --cc src/frame.c
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/macterm.c
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc src/xfns.c
Simple merge

diff --cc src/xmenu.c
Simple merge