From: yamaoka <yamaoka>
Date: Fri, 9 Jan 2009 09:28:33 +0000 (+0000)
Subject: (infohack-texi-format): Use locale-coding-system for Emacs to encode Japanese
X-Git-Tag: ngnus-0_11-doc-ja~128
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=276301d1813ea053de2d8598ebfb647c3943a971;p=elisp%2Fgnus-doc-ja.git

(infohack-texi-format): Use locale-coding-system for Emacs to encode Japanese
 messages.
---

diff --git a/ChangeLog b/ChangeLog
index 5ac849c..25cf6f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-09  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* infohack.el (infohack-texi-format): Use locale-coding-system for
+	Emacs to encode Japanese messages.
+
 2008-09-25  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* infohack.el: Don't do a workaround reducing the number of split Info
diff --git a/infohack.el b/infohack.el
index a9af043..69f4d66 100644
--- a/infohack.el
+++ b/infohack.el
@@ -1,5 +1,5 @@
 ;;; infohack.el --- a hack to format info file.
-;; Copyright (C)  2001, 2003, 2004, 2008  Free Software Foundation, Inc.
+;; Copyright (C)  2001, 2003, 2004, 2008, 2009  Free Software Foundation, Inc.
 
 ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
 ;; Keywords: info
@@ -174,7 +174,12 @@ Both characters must have the same length of multi-byte form."
 	  (texinfo-every-node-update)
 	  (set-buffer-modified-p nil)
 	  (message "texinfo formatting %s..." file)
-	  (let ((si:message (symbol-function 'message)))
+	  (let ((si:message (symbol-function 'message))
+		(coding (or (and (string-match "\\`Japanese"
+					       current-language-environment)
+				 (boundp 'locale-coding-system)
+				 locale-coding-system)
+			    'iso-2022-7bit)))
 	    ;; Encode messages to terminal.
 	    (fset
 	     'message
@@ -185,11 +190,11 @@ Both characters must have the same length of multi-byte form."
 				  (equal (car args) buffer-file-name))
 		       (funcall ,si:message "%s"
 				(encode-coding-string (apply 'format fmt args)
-						      'iso-2022-7bit))))
+						      ',coding))))
 		`(lambda (fmt &rest args)
 		   (funcall ,si:message "%s"
 			    (encode-coding-string (apply 'format fmt args)
-						  'iso-2022-7bit))))))
+						  ',coding))))))
 	    (unwind-protect
 		(texinfo-format-buffer nil)
 	      (fset 'message si:message)))