From: Kenichi Handa Date: Fri, 3 Feb 2006 11:34:53 +0000 (+0000) Subject: (set-locale-environment): Add "/usr/share/X11/locale/locale.alias" to X-Git-Tag: emacs-pretest-22.0.90~4394 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6bba8c7028c7ef33a917754ad6259a010831d652;p=emacs.git (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 e083710c6e7..da4ba5df39b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2006-02-03 Jens Petersen (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 (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 7756aa58ccd..207f552bad5 100644 --- 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 ;;