From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Jens Petersen Newsgroups: gmane.emacs.devel Subject: [patch] X11 locale.alias Date: Fri, 3 Feb 2006 16:49:57 +0900 Organization: Red Hat Message-ID: <20060203164957.cab10f39.petersen@redhat.com> NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Trace: sea.gmane.org 1138955889 21825 80.91.229.2 (3 Feb 2006 08:38:09 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Fri, 3 Feb 2006 08:38:09 +0000 (UTC) Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Feb 03 09:38:08 2006 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by ciao.gmane.org with esmtp (Exim 4.43) id 1F4wSE-0001wS-W5 for ged-emacs-devel@m.gmane.org; Fri, 03 Feb 2006 09:38:07 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1F4wVN-00006W-RM for ged-emacs-devel@m.gmane.org; Fri, 03 Feb 2006 03:41:22 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1F4vl3-00042p-2A for emacs-devel@gnu.org; Fri, 03 Feb 2006 02:53:29 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1F4vkz-00041i-AY for emacs-devel@gnu.org; Fri, 03 Feb 2006 02:53:27 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1F4vky-00040y-0Y for emacs-devel@gnu.org; Fri, 03 Feb 2006 02:53:24 -0500 Original-Received: from [66.187.233.31] (helo=mx1.redhat.com) by monty-python.gnu.org with esmtp (Exim 4.52) id 1F4vjw-0005UO-86 for emacs-devel@gnu.org; Fri, 03 Feb 2006 02:52:20 -0500 Original-Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by mx1.redhat.com (8.12.11/8.12.11) with ESMTP id k137o1N9023294 for ; Fri, 3 Feb 2006 02:50:01 -0500 Original-Received: from juhp.dyndns.org (vpn-4-1.tokyo.redhat.com [10.64.4.1]) by int-mx1.corp.redhat.com (8.11.6/8.11.6) with SMTP id k137o0101040 for ; Fri, 3 Feb 2006 02:50:00 -0500 Original-To: emacs-devel@gnu.org X-Mailer: Sylpheed version 2.2.0beta6 (GTK+ 2.6.10; x86_64-redhat-linux-gnu) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:49959 Archived-At: Hi, Below is a small patch for supporting modular xorg-x11 better. Jens 2006-02-03 Jens Petersen * international/mule-cmds.el (set-locale-environment): Add "/usr/share/X11/locale/locale.alias" to search list for xorg-x11 libX11. Index: lisp/international/mule-cmds.el =================================================================== RCS file: /sources/emacs/emacs/lisp/international/mule-cmds.el,v retrieving revision 1.289 diff -u -r1.289 mule-cmds.el --- lisp/international/mule-cmds.el 7 Dec 2005 07:27:28 -0000 1.289 +++ lisp/international/mule-cmds.el 3 Feb 2006 07:27:58 -0000 @@ -2435,7 +2435,8 @@ ;; 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 ;;