Update of /cvsroot/fink/experimental/todai/user-ja/sedsrc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30595/sedsrc

Modified Files:
        user-ja.el.in 
Log Message:
2.2 release

* sedsrc/user-ja.el.in: emacs22-carbon-22.0.50.cvs20060118
* sedsrc/utf-8m.el.in: removed as emacs22-carbon has it
* build.sh: use "go cd"


Index: user-ja.el.in
===================================================================
RCS file: /cvsroot/fink/experimental/todai/user-ja/sedsrc/user-ja.el.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- user-ja.el.in       7 Apr 2005 12:31:26 -0000       1.1.1.1
+++ user-ja.el.in       7 Mar 2006 13:19:22 -0000       1.2
@@ -1,28 +1,43 @@
 ;; Language environment settings
 ;; $Id$
-(require 'utf-8m)
 
-(set-language-environment "Japanese")
-(setq utf-decode-to-japanese-symbol t) ;; obsolete
-(utf-translate-cjk-mode t)
-(custom-set-variables
-  '(utf-fragment-on-decoding nil)
-  '(utf-translate-cjk-unicode-range '((#x80 . #xd7a3) (#xff00 . #xffef)))
-  '(default-input-method "japanese-yc")
-  )
-(set-default-coding-systems 'utf-8)
-(set-buffer-file-coding-system 'utf-8)
-(unless (and (boundp 'mac-access-clipboard-in-unicode)
-            mac-access-clipboard-in-unicode)
-  (set-clipboard-coding-system 'sjis-mac))
-(set-terminal-coding-system 'utf-8)
-(set-keyboard-coding-system
- (if (eq window-system 'mac) 'sjis-mac 'utf-8))
-(set-file-name-coding-system 'utf-8m)
-;; Workaround a bug of emacs21-20041117
-(if (and (fboundp 'utf-translate-cjk-load-tables)
-        (eq fink-emacs-flavor 'emacs21))
-    (utf-translate-cjk-load-tables))
+;; Setup Japanese UTF-8 environment.
+;; Recent Emacs 22 (22.0.50.cvs20060118) is enough clever for us
+;; to accept most of its default configurations.
+;; We don't need even set-language-environment!
+(when (eq emacs-major-version 22)
+  (if (require 'utf-8m nil t)
+      (set-file-name-coding-system 'utf-8m))
+  (cond ((and (eq window-system 'mac)
+              (fboundp 'mac-setup-inline-input-method))
+         (mac-setup-inline-input-method))
+        ((eq current-language-environment "Japanese")
+         (custom-set-variables '(default-input-method "japanese-yc")))))
+;; For Todai Fink Team's obsolete emacs21-carbon package.
+;; As we moved utf-8m.el into emacs22-carbon, utf-8m is not available
+;; on emacs21-carbon now.
+(when (eq emacs-major-version 21)
+  (set-language-environment "Japanese")
+  (setq utf-decode-to-japanese-symbol t) ;; obsolete
+  (utf-translate-cjk-mode t)
+  (custom-set-variables
+    '(utf-fragment-on-decoding nil)
+    '(utf-translate-cjk-unicode-range '((#x80 . #xd7a3) (#xff00 . #xffef)))
+    '(default-input-method "japanese-yc")
+    )
+  (set-default-coding-systems 'utf-8)
+  (set-buffer-file-coding-system 'utf-8)
+  (unless (and (boundp 'mac-access-clipboard-in-unicode)
+               mac-access-clipboard-in-unicode)
+    (set-clipboard-coding-system 'sjis-mac))
+  (set-terminal-coding-system 'utf-8)
+  (set-keyboard-coding-system
+   (if (eq window-system 'mac) 'sjis-mac 'utf-8))
+  (set-file-name-coding-system 'utf-8)
+  ;; Workaround a bug of emacs21-20041117
+  (if (and (fboundp 'utf-translate-cjk-load-tables)
+           (eq fink-emacs-flavor 'emacs21))
+      (utf-translate-cjk-load-tables)))
 
 ;; Set up the keyboard so the delete key on both the regular keyboard
 ;; and the keypad delete the character under the cursor and to the right
@@ -72,7 +87,13 @@
 
 ;; carbon-font or appleotffonts-ja
 (when (eq window-system 'mac)
-  (if (require 'carbon-font nil t)
-      (set-default-font "fontset-hiraginokaku12")
-    (require 'appleotffonts-ja)        ;; for emacs21-carbon < 20041229
-    (set-default-font "fontset-hirakakugo14")))
+  (cond ((require 'carbon-font nil t)
+         (cond ((memq 
"-*-*-medium-r-normal--12-*-*-*-*-*-fontset-hiraginokaku" (fontset-list))
+                ;; for emacs22-carbon >= 22.0.50.cvs20060118
+                (set-default-font "hiraginokaku"))
+               ((memq 
"-*-fixed-medium-r-normal-*-12-*-*-*-*-*-fontset-hiraginokaku12" (fontset-list))
+                ;; for emacs21-carbon >= 20041229
+                (set-default-font "fontset-hiraginokaku12"))))
+        ((require 'appleotffonts-ja nil t)
+         ;; for emacs21-carbon < 20041229
+         (set-default-font "fontset-hirakakugo14"))))



-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to