(mac-text-encoding-ascii): New constant.

(mac-utxt-to-string): Use it.
(mac-ts-update-active-input-area): Use mac-ae-number.

diff --git a/lisp/term/mac-win.el b/lisp/term/mac-win.el
index 5c546f77d333bff1ae53143868a9ff41de5203f7..7ab9ac9481f83bd9d5a6af082c7baa447b32743c 100644 (file)
--- a/lisp/term/mac-win.el
+++ b/lisp/term/mac-win.el
@@ -1249,6 +1249,9 @@ correspoinding TextEncodingBase value."
 \f
 ;;;; Conversion between common flavors and Lisp string.
 
+(defconst mac-text-encoding-ascii #x600
+  "ASCII text encoding.")
+
 (defconst mac-text-encoding-mac-japanese-basic-variant #x20001
   "MacJapanese text encoding without Apple double-byte extensions.")
 
@@ -1269,7 +1272,7 @@ correspoinding TextEncodingBase value."
          (if (string-match "[\xa0\xfd-\xff]" str)
              (setq str nil)
            ;; ASCII-only?
-           (unless (string-match "\\`[[:ascii:]]*\\'" str)
+           (unless (mac-code-convert-string data nil mac-text-encoding-ascii)
              (subst-char-in-string ?\x5c ?\\e(J\\e(B str t)
              (subst-char-in-string ?\x80 ?\\ str t)))))
     (or str
@@ -1965,8 +1968,7 @@ either in the current buffer or in the echo area."
         (coding (or (cdr (assq (car script-language)
                                mac-script-code-coding-systems))
                     'mac-roman))
-        (fix-len (mac-bytes-to-integer
-                  (cdr (mac-ae-parameter ae "tsfx" "long"))))
+        (fix-len (mac-ae-number ae "tsfx"))
         ;; Optional parameters
         (hilite-rng (mac-ae-text-range-array ae "tshi"))
         (update-rng (mac-ae-text-range-array ae "tsup"))
@@ -2008,15 +2010,15 @@ either in the current buffer or in the echo area."
       (put-text-property 0 (length active-input-string)
                         'mac-ts-active-input-string t active-input-string)
       (if use-echo-area
-         (let (msg message-log-max)
-           (if (and (current-message)
+         (let ((msg (current-message))
+               message-log-max)
+           (if (and msg
                     ;; Don't get confused by previously displayed
                     ;; `active-input-string'.
                     (null (get-text-property 0 'mac-ts-active-input-string
-                                             (current-message))))
-               (setq msg (propertize (current-message) 'display
-                                     (concat (current-message)
-                                             active-input-string)))
+                                             msg)))
+               (setq msg (propertize msg 'display
+                                     (concat msg active-input-string)))
              (setq msg active-input-string))
            (message "%s" msg)
            (overlay-put mac-ts-active-input-overlay 'before-string nil))