From: Karoly Lorentey Date: Wed, 16 Mar 2005 16:06:15 +0000 (+0000) Subject: Merged from miles@gnu.org--gnu-2005 (patch 37-38, 162-182) X-Git-Tag: emacs-pretest-23.0.90~11236^2~141^2~291 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=14c0ac78c48e6bdf832e370ef15ecbef6573dd06;p=emacs.git 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 --- 14c0ac78c48e6bdf832e370ef15ecbef6573dd06 diff --cc lisp/international/mule-cmds.el index 24992b3c10b,a06c438b421..3fac3ab6dd9 --- a/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/simple.el index d0d5f9f0170,28b62a27098..99e826a6d18 --- a/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