1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-26 07:33:47 +00:00

(locale-translation-file-name):

Defvar to nil.
(set-locale-environment): Set it here (at runtime).
This commit is contained in:
Dave Love 2000-04-25 23:16:28 +00:00
parent 612839b6b2
commit 0d7c5bb952
2 changed files with 24 additions and 13 deletions

View File

@ -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

View File

@ -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.