From: Richard M. Stallman <rms@gnu.org>
Date: Mon, 4 Jul 1994 23:24:46 +0000 (+0000)
Subject: (iso-8859-1-locale-regexp): New variable.
X-Git-Tag: emacs-19.34~7716
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=64f62b4508e4b990df65a21709ceb01d31eb20b0;p=emacs.git

(iso-8859-1-locale-regexp): New variable.
(command-line): Use it.
---

diff --git a/lisp/startup.el b/lisp/startup.el
index 1f36da823e8..4fece7dda51 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -201,6 +201,9 @@ this variable, if non-nil; 2. `~/.emacs'; 3. `default.el'.")
 	       (x-popup-menu nil (cdr (cdr (car submap)))))
 	  (setq submap (cdr submap))))))
 
+(defconst iso-8859-1-locale-regexp "iso[-_]?8859[-_]1"
+  "Use ISO 8859-1 character set by default if this regexp matches LC_CTYPE.")
+
 (defun command-line ()
   (setq command-line-default-directory default-directory)
 
@@ -217,8 +220,7 @@ this variable, if non-nil; 2. `~/.emacs'; 3. `default.el'.")
 	       (string= vc "simple"))
 	   (setq version-control 'never))))
 
-  (if (or (string-equal (getenv "LC_CTYPE") "iso_8859_1")
-	  (string-equal (getenv "LC_CTYPE") "iso-8859-1"))
+  (if (string-match iso-8859-1-locale-regexp (getenv "LC_CTYPE"))
       (progn 
 	(standard-display-european t)
 	(require 'iso-syntax)))