From: Dave Love <fx@gnu.org>
Date: Tue, 25 Apr 2000 23:16:28 +0000 (+0000)
Subject: (locale-translation-file-name):
X-Git-Tag: emacs-pretest-21.0.90~4138
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0d7c5bb95202395a7b56589a22f6db2402b55a9c;p=emacs.git

(locale-translation-file-name):
Defvar to nil.
(set-locale-environment): Set it here (at runtime).
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 057c6aa63b2..18468c09f54 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2000-04-26  Dave Love  <fx@gnu.org>
+
+	* international/mule-cmds.el (locale-translation-file-name):
+	Defvar to nil.
+	(set-locale-environment): Set it here (at runtime).
+
 2000-04-25  Gerd Moellmann  <gerd@gnu.org>
 
 	* replace.el (perform-replace): Add parameters START and END.  Use
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 2128c9c68b7..7aed2f96793 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -1461,19 +1461,8 @@ of buffer-file-coding-system set by this function."
 
 ;;; Locales.
 
-(defvar locale-translation-file-name
-  (let ((files '("/usr/lib/X11/locale/locale.alias" ; e.g. X11R6.4
-		 "/usr/X11R6/lib/X11/locale/locale.alias" ; e.g. RedHat 4.2
-		 "/usr/openwin/lib/locale/locale.alias" ; e.g. Solaris 2.6
-		 ;;
-		 ;; The following name appears after the X-related names above,
-		 ;; since the X-related names are what X actually uses.
-		 "/usr/share/locale/locale.alias" ; GNU/Linux sans X
-		 )))
-    (while (and files (not (file-exists-p (car files))))
-      (setq files (cdr files)))
-    (car files))
-  "*File name for the system's file of locale-name aliases, or nil if none.")
+(defvar locale-translation-file-name nil
+  "File name for the system's file of locale-name aliases, or nil if none.")
 
 (defvar locale-language-names
   '(
@@ -1705,6 +1694,22 @@ If LOCALE-NAME is nil, its value is taken from the environment.
 The locale names supported by your system can typically be found in a
 directory named `/usr/share/locale' or `/usr/lib/locale'."
 
+  ;; Do this at runtime for the sake of binaries possibly transported
+  ;; to a system without X.
+  (setq locale-translation-file-name
+	(let ((files
+	       '("/usr/lib/X11/locale/locale.alias" ; e.g. X11R6.4
+		 "/usr/X11R6/lib/X11/locale/locale.alias" ; e.g. RedHat 4.2
+		 "/usr/openwin/lib/locale/locale.alias" ; e.g. Solaris 2.6
+		 ;;
+		 ;; The following name appears after the X-related names above,
+		 ;; since the X-related names are what X actually uses.
+		 "/usr/share/locale/locale.alias" ; GNU/Linux sans X
+		 )))
+	  (while (and files (not (file-exists-p (car files))))
+	    (setq files (cdr files)))
+	  (car files)))
+
   (unless locale-name
     ;; Use the first of these three environment variables
     ;; that has a nonempty value.