Mercurial > emacs

changeset 71356:a183bff9cb83

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(mac-text-encoding-ascii): New constant. (mac-utxt-to-string): Use it. (mac-ts-update-active-input-area): Use mac-ae-number.
author YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
date Fri, 16 Jun 2006 08:07:59 +0000
parents 763764b2c2a4
children c2028c244c54
files lisp/term/mac-win.el
diffstat 1 files changed, 11 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/term/mac-win.el	Fri Jun 16 08:07:51 2006 +0000
+++ b/lisp/term/mac-win.el	Fri Jun 16 08:07:59 2006 +0000
@@ -1249,6 +1249,9 @@
 
 ;;;; 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 @@
 	  (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 ?\¥ str t)
 	      (subst-char-in-string ?\x80 ?\\ str t)))))
     (or str
@@ -1965,8 +1968,7 @@
 	 (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 @@
       (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))