3 files changed, 10 insertions, 9 deletions
diff --git a/japanese/emacs-manual/files/Makefile.in b/japanese/emacs-manual/files/Makefile.in
index ae123a322465..f6727b76474a 100644
--- a/japanese/emacs-manual/files/Makefile.in
+++ b/japanese/emacs-manual/files/Makefile.in
@@ -5,7 +5,7 @@ EMACS?=	emacs
 
 EMACS_ARGS= -batch -nw --multibyte -no-init-file -no-site-file
 EMACS_LOADLIBS= --load=texinfmt.el --load=PORT_TEXIFMT.MK
-EMACS_FUNCALLS= --eval "(defconst PORT-TEXI \"${TEXIFILE}\")" -f port-texinfo-format
+EMACS_FUNCALLS= --eval "(port-texinfo-format \"${TEXIFILE}\" 'junet)"
 
 all: ${INFOFILE}
 
diff --git a/japanese/emacs-manual/files/PORT_TEXIFMT.MK b/japanese/emacs-manual/files/PORT_TEXIFMT.MK
index 9443db0cbd56..a050d11992dd 100644
--- a/japanese/emacs-manual/files/PORT_TEXIFMT.MK
+++ b/japanese/emacs-manual/files/PORT_TEXIFMT.MK
@@ -2,13 +2,14 @@
 ;;; PORT_TEXIFMT.MK --- for texinfo-format
 ;;; Code:
 
-(defun port-texinfo-format ()
+(defun port-texinfo-format (file &optional coding-system)
   (let (obuf)
-    (find-file (expand-file-name PORT-TEXI))
+    (find-file (expand-file-name file))
     (setq obuf (current-buffer))
     (require 'texinfmt)
     (texinfo-format-buffer t)
-    (set-buffer-file-coding-system 'iso-2022-jp)
+    (if coding-system
+      (set-buffer-file-coding-system coding-system))
     (save-buffer)
     (kill-buffer (current-buffer))
     (kill-buffer obuf)))
diff --git a/japanese/emacs-manual/files/patch-aa b/japanese/emacs-manual/files/patch-aa
index ba7a34aa2f95..1b426c743e0f 100644
--- a/japanese/emacs-manual/files/patch-aa
+++ b/japanese/emacs-manual/files/patch-aa
@@ -1,6 +1,6 @@
---- emacs.texi~	Mon Dec 13 16:50:47 1999
-+++ emacs.texi	Sat Jan  8 01:55:18 2000
-@@ -12,7 +12,8 @@
+--- emacs.texi.~1~	Thu Mar 23 12:16:23 2000
++++ emacs.texi	Mon Apr  3 22:38:11 2000
+@@ -14,7 +14,8 @@
  @setchapternewpage odd
  @c @settitle GNU Emacs Manual
  @settitle GNU Emacsマニュアル
@@ -10,8 +10,8 @@
  @synindex pg cp
  
  @ifinfo
-@@ -22,9 +23,9 @@
- Emacs 20.5版対応に改訂した@cite{GNU Emacs Manual} 13版です。
+@@ -24,9 +25,9 @@
+ Emacs 20.6版対応に改訂した@cite{GNU Emacs Manual} 13版です。
  @c Please REMEMBER to update edition number in *three* places in this file.
  
 -@dircategory Editors