Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-17 01:34:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

(setenv): Fix previous change.

Browse source
This commit is contained in:
Kenichi Handa 2003-02-25 06:19:36 +00:00
parent bb8db7e1f5
commit 1ebb05c430
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/ChangeLog
View file

@ -1,3 +1,7 @@
2003-02-25 Kenichi Handa <handa@m17n.org>
* env.el (setenv): Fix previous change.
2003-02-25 Ramakrishnan M <rama@gnu.org> (tiny change)
* language/mlm-util.el (mlm-char-glyph): Fix more rules.

12
lisp/env.el
View file

@ -121,13 +121,11 @@ a side-effect."
nil
t))))
(if (and (multibyte-string-p variable) locale-coding-system)
(unless (memq (coding-system-base locale-coding-system)
(find-coding-systems-string (concat variable value)))
(error "Can't encode `%s=%s' with `locale-coding-system'"
variable (or value "")))
(unless (memq 'undecided (find-coding-systems-string variable))
(error "Can't encode `%s=%s' with unspecified `locale-coding-system'"
variable (or value ""))))
(let ((codings (find-coding-systems-string (concat variable value))))
(unless (or (eq 'undecided (car codings))
(memq (coding-system-base locale-coding-system) codings))
(error "Can't encode `%s=%s' with `locale-coding-system'"
variable (or value "")))))
(if unset
(setq value nil)
(if substitute-env-vars