[Emacs-diffs] Changes to emacs/lisp/term/mac-win.el,v

[YAMAMOTO Mitsuharu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     YAMAMOTO Mitsuharu <mituharu>   06/08/30 08:51:28

Index: mac-win.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/term/mac-win.el,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -b -r1.77 -r1.78
--- mac-win.el  27 Aug 2006 07:08:07 -0000      1.77
+++ mac-win.el  30 Aug 2006 08:51:28 -0000      1.78
@@ -1287,14 +1287,19 @@
                     (find-coding-systems-string string)))
       (setq coding-system
            (coding-system-change-eol-conversion coding-system 'mac))
+      (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 string (subst-char-in-string ?\\ ?\x80 string))
-       (subst-char-in-string ?\(J\(B ?\x5c string t))
+         (setq str (subst-char-in-string ?\\ ?\x80 str))
+         (subst-char-in-string ?\(J\(B ?\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 string coding-system)
-                 (or encoding coding-system) nil)))
+                        (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)))))