[macemacsjp-cvs 122] CVS update: CarbonEmacsPackage/GPL/site-start.d

Back to archive index

Seiji Zenitani zenit****@users*****
2005年 11月 16日 (水) 22:48:25 JST


Index: CarbonEmacsPackage/GPL/site-start.d/carbon-emacs-japanese-init.el
diff -u CarbonEmacsPackage/GPL/site-start.d/carbon-emacs-japanese-init.el:1.8 CarbonEmacsPackage/GPL/site-start.d/carbon-emacs-japanese-init.el:1.9
--- CarbonEmacsPackage/GPL/site-start.d/carbon-emacs-japanese-init.el:1.8	Sun Nov 13 21:19:09 2005
+++ CarbonEmacsPackage/GPL/site-start.d/carbon-emacs-japanese-init.el	Wed Nov 16 22:48:25 2005
@@ -3,10 +3,22 @@
 ;; Settings will be ignored in a non-Japanese environment
 ;; 日本語環境でのみ以下の設定をロードします
 
-;; The environment variable __CF_USER_TEXT_ENCODING could be
-;; "0x1F5:1:14", "0x1F6:1:14", "0x1F7:1:14" ...
-;; (from wakimoto-san, [Macemacsjp-users 736])
-(when (string-match ":1:14\\'" (getenv "__CF_USER_TEXT_ENCODING"))
+(when
+
+    (or
+     ;; 1. Mac OS X Japanese Language environment
+     ;; The environment variable __CF_USER_TEXT_ENCODING could be
+     ;; "0x1F5:1:14", "0x1F6:1:14", "0x1F7:1:14" ...
+     ;; (from wakimoto-san, [Macemacsjp-users 736])
+     (string-match ":1:14\\'" (getenv "__CF_USER_TEXT_ENCODING"))
+     ;; 2. Hidden flag in the preference file:
+     ;; force-load this Japanese configuration file
+     ;; $ defaults CarbonEmacsPackage LanguageSetting Japanese
+     (equal "Japanese"
+            (mac-get-preference "LanguageSetting" "CarbonEmacsPackage"))
+     ) ;; end (or
+
+  ;; ============= Japanese language setting ======================
 
   (set-language-environment 'Japanese)
   (set-default-coding-systems 'euc-jp-unix)
@@ -16,7 +28,7 @@
   (set-terminal-coding-system 'utf-8)
 ;; (set-file-name-coding-system 'utf-8m) ; already set
 
-  ;; inline input method
+  ;; ---- inline input method (window-system) ----
   (when (eq window-system 'mac)
 ;;   (setq default-input-method "MacOSX-IM-JP")
     (add-hook 'isearch-mode-hook 'mac-im-isearch-mode-setup)
@@ -38,7 +50,11 @@
     ;;   smKorean      = 3,
     ;;   smSimpChinese = 25,   /* Simplified Chinese*/
 
-    ) ; end -- (inline input method)
-  ) ; end -- (__CF_USER_TEXT_ENCODING)
+    )
+  ;; ---- inline nput method ----
+
+  ;; ============= Japanese language setting ======================
+
+  )
 
 ;; end
\ No newline at end of file


macemacsjp-cvs メーリングリストの案内
Back to archive index