changeset 69725:3894622d0c1c

(mac-system-coding-system): Define and use after Mac-specific coding systems are ready.
author YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
date Thu, 30 Mar 2006 02:23:08 +0000
parents 3c3603207d79
children 92e02f0f8ef3
files lisp/term/mac-win.el
diffstat 1 files changed, 11 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/term/mac-win.el	Thu Mar 30 00:47:04 2006 +0000
+++ b/lisp/term/mac-win.el	Thu Mar 30 02:23:08 2006 +0000
@@ -1103,15 +1103,6 @@
     )
   "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 @@
 
 ;;;; 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 @@
 ;; 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."