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

[YAMAMOTO Mitsuharu]

Index: emacs/lisp/term/mac-win.el
diff -u emacs/lisp/term/mac-win.el:1.63 emacs/lisp/term/mac-win.el:1.64
--- emacs/lisp/term/mac-win.el:1.63     Fri Feb 10 08:19:53 2006
+++ emacs/lisp/term/mac-win.el  Sat Mar 25 07:40:32 2006
@@ -1336,7 +1336,8 @@
              (setq str (or s
                            (encode-coding-string str
                                                  (if (eq (byteorder) ?B)
-                                                     'utf-16be 'utf-16le))))))
+                                                     'utf-16be-mac
+                                                   'utf-16le-mac))))))
           ((eq type 'com.apple.traditional-mac-plain-text)
            (let ((encodables (find-coding-systems-string str))
                  (rest mac-script-code-coding-systems))
@@ -1896,6 +1897,22 @@
     (fontset-add-mac-fonts fontset t)
     fontset))
 
+;; Adjust Courier font specifications in x-fixed-font-alist.
+(let ((courier-fonts (assoc "Courier" x-fixed-font-alist)))
+  (if courier-fonts
+      (dolist (label-fonts (cdr courier-fonts))
+       (setcdr label-fonts
+               (mapcar
+                (lambda (font)
+                  (if (string-match 
"\\`-adobe-courier-\\([^-]*\\)-\\(.\\)-\\(.*\\)-iso8859-1\\'" font)
+                      (replace-match
+                       (if (string= (match-string 2 font) "o")
+                           "-*-courier-\\1-i-\\3-*-*"
+                         "-*-courier-\\1-\\2-\\3-*-*")
+                       t nil font)
+                    font))
+                (cdr label-fonts))))))
+
 ;; Setup the default fontset.
 (setup-default-fontset)
 (cond ((x-list-fonts "*-iso10646-1")