From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Date: Thu, 30 Mar 2006 02:23:27 +0000 (+0000)
Subject: (mac-system-coding-system): Define and use after
X-Git-Tag: emacs-pretest-22.0.90~3385
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4da2c33b4c50b675df2bd15e2c4a0beac45243ff;p=emacs.git

(mac-system-coding-system): Define and use after
Mac-specific coding systems are ready.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b5e95c59705..ae6a6ae4c31 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-30  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* term/mac-win.el (mac-system-coding-system): Define and use after
+	Mac-specific coding systems are ready.
+
 2006-03-27  Romain Francoise  <romain@orebokech.com>
 
 	* net/rcirc.el (rcirc-connect): Add autoload cookie.
diff --git a/lisp/term/mac-win.el b/lisp/term/mac-win.el
index 38795d38461..68c95d4b319 100644
--- a/lisp/term/mac-win.el
+++ b/lisp/term/mac-win.el
@@ -1103,15 +1103,6 @@ XConsortium: rgb.txt,v 10.41 94/02/20 18:39:36 rws Exp")
     )
   "Alist of Mac script codes vs Emacs coding systems.")
 
-(defconst mac-system-coding-system
-  (let ((base (or (cdr (assq mac-system-script-code
-			     mac-script-code-coding-systems))
-		  'mac-roman)))
-    (if (eq system-type 'darwin)
-	base
-      (coding-system-change-eol-conversion base 'mac)))
-  "Coding system derived from the system script code.")
-
 (defun mac-add-charset-info (xlfd-charset mac-text-encoding)
   "Add a character set to display with Mac fonts.
 Create an entry in `mac-charset-info-alist'.
@@ -1153,9 +1144,6 @@ correspoinding TextEncodingBase value."
 
 ;;;; Selections
 
-;; Setup to use the Mac clipboard.
-(set-selection-coding-system mac-system-coding-system)
-
 ;;; We keep track of the last text selected here, so we can check the
 ;;; current selection against it, and avoid passing back our own text
 ;;; from x-get-selection-value.
@@ -2024,6 +2012,17 @@ ascii:-*-Monaco-*-*-*-*-12-*-*-*-*-*-mac-roman")
 ;; Enable CLIPBOARD copy/paste through menu bar commands.
 (menu-bar-enable-clipboard)
 
+(defconst mac-system-coding-system
+  (let ((base (or (cdr (assq mac-system-script-code
+			     mac-script-code-coding-systems))
+		  'mac-roman)))
+    (if (eq system-type 'darwin)
+	base
+      (coding-system-change-eol-conversion base 'mac)))
+  "Coding system derived from the system script code.")
+
+(set-selection-coding-system mac-system-coding-system)
+
 (defun mac-drag-n-drop (event)
   "Edit the files listed in the drag-n-drop EVENT.
 Switch to a buffer editing the last file dropped."