(set-locale-environment): Add "/usr/share/X11/locale/locale.alias" to

search list for xorg-x11 libX11.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e083710c6e7acab6f97cd9733c215bfb232512ac..da4ba5df39b9ff4cb18495aaff534b23c4699f54 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-03  Jens Petersen  <petersen@redhat.com>  (tiny change)
+
+       * international/mule-cmds.el (set-locale-environment): Add
+       "/usr/share/X11/locale/locale.alias" to search list for xorg-x11
+       libX11.
+
 2006-02-03  Joe Wells  <jbw@macs.hw.ac.uk>  (tiny change)
 
        * arc-mode.el (archive-maybe-copy): Fix the way directories in the

diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 7756aa58ccd8fa869af4c5a8ae344e07e0b9e8e3..207f552bad512c12d951f094beb8afc3db1b70d5 100644 (file)
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -2435,7 +2435,8 @@ See also `locale-charset-language-names', `locale-language-names',
   ;; to a system without X.
   (setq locale-translation-file-name
        (let ((files
-              '("/usr/lib/X11/locale/locale.alias" ; e.g. X11R6.4
+              '("/usr/share/X11/locale/locale.alias" ; e.g. X11R7
+                "/usr/lib/X11/locale/locale.alias" ; e.g. X11R6.4
                 "/usr/X11R6/lib/X11/locale/locale.alias" ; XFree86, e.g. RedHat 4.2
                 "/usr/openwin/lib/locale/locale.alias" ; e.g. Solaris 2.6
                 ;;