diff options
| author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2006-08-30 08:51:52 +0000 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2006-08-30 08:51:52 +0000 |
| commit | 762ce89d584fcb8597f6497b0078f4a84f19803e (patch) | |
| tree | 8708935ea857a0774565d19dfc62bd5630bf5c1d /lisp/term | |
| parent | 41d24b39c7a261c08e66a9397e128c639cace0bb (diff) | |
| download | emacs-762ce89d584fcb8597f6497b0078f4a84f19803e.tar.gz | |
(mac-string-to-utxt): If adjustment for MacJapanese
results in ASCII-only string, encode original one directly.
Diffstat (limited to 'lisp/term')
| -rw-r--r-- | lisp/term/mac-win.el | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/lisp/term/mac-win.el b/lisp/term/mac-win.el index 538aa09b2c5..20a65976a5c 100644 --- a/lisp/term/mac-win.el +++ b/lisp/term/mac-win.el @@ -1287,14 +1287,19 @@ correspoinding TextEncodingBase value." (find-coding-systems-string string))) (setq coding-system (coding-system-change-eol-conversion coding-system 'mac)) - (when (and (eq system-type 'darwin) - (eq coding-system 'japanese-shift-jis-mac)) - (setq encoding mac-text-encoding-mac-japanese-basic-variant) - (setq string (subst-char-in-string ?\\ ?\x80 string)) - (subst-char-in-string ?\¥ ?\x5c string t)) - (setq data (mac-code-convert-string - (encode-coding-string string coding-system) - (or encoding coding-system) nil))) + (let ((str string)) + (when (and (eq system-type 'darwin) + (eq coding-system 'japanese-shift-jis-mac)) + (setq encoding mac-text-encoding-mac-japanese-basic-variant) + (setq str (subst-char-in-string ?\\ ?\x80 str)) + (subst-char-in-string ?\¥ ?\x5c str t) + ;; ASCII-only? + (if (string-match "\\`[\x00-\x7f]*\\'" str) + (setq str nil))) + (and str + (setq data (mac-code-convert-string + (encode-coding-string str coding-system) + (or encoding coding-system) nil))))) (or data (encode-coding-string string (if (eq (byteorder) ?B) 'utf-16be-mac 'utf-16le-mac))))) |