Synch with Oort Gnus.

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 9a5dac2..5eab462 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,11 @@
+2001-09-28 07:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * Makefile.in (.texi): Remove $@ first.
+
+       * infohack.el (infohack-remove-unsupported): Remove @iflatex lines.
+       (infohack): Specify a coding-system to save info files.
+       From Katsumi Yamaoka  <yamaoka@jpl.org>
+       
 2001-09-28 00:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * gnusconfig.tex.in: Use cmss if pfu is not found.

diff --git a/texi/Makefile.in b/texi/Makefile.in
index 3f73173..291865e 100644 (file)
--- a/texi/Makefile.in
+++ b/texi/Makefile.in
@@ -40,15 +40,18 @@ message-ja.info: message-ja.texi
 most: texi2latex.elc latex latexps
 
 %-ja: %-ja.texi
+       rm -f $@; \
        $(EMACSINFO) $<
 
 %-ja.info: %-ja.texi
+       rm -f $@; \
        $(EMACSINFO) $< t
 
 %.info: %.texi
        if test "x$(MAKEINFO)" = "xno" \
          -o "$<" = "gnus-ja.texi" \
          -o "$<" = "message-ja.texi"; then \
+         rm -f $@; \
          $(EMACSINFO) $< t; \
        else \
          $(MAKEINFO) -I $(srcdir) -o $@ $<; \
@@ -60,6 +63,7 @@ most: texi2latex.elc latex latexps
        if test "x$(MAKEINFO)" = "xno" \
          -o "$<" = "gnus-ja.texi" \
          -o "$<" = "message-ja.texi"; then \
+         rm -f $@; \
          $(EMACSINFO) $<; \
        else \
          $(MAKEINFO) -I $(srcdir) -o $* $<; \
@@ -73,13 +77,13 @@ pdf: tmps gnus.pdf message.pdf refcard.pdf emacs-mime.pdf
        sed -e '/@iflatex/,/@end iflatex/d' $< > gnustmp.texi
        $(TEXI2DVI) -I $(srcdir) gnustmp.texi
        cp gnustmp.dvi $*.dvi
-       rm gnustmp.*
+       rm -f gnustmp.*
 
 .texi.pdf :
        sed -e '/@iflatex/,/@end iflatex/d' $< > gnustmp.texi
        $(TEXI2PDF) -I $(srcdir) gnustmp.texi
        cp gnustmp.pdf $*.pdf
-       rm gnustmp.*
+       rm -f gnustmp.*
 
 refcard.dvi: refcard.tex gnuslogo.refcard gnusref.tex
        TEXINPUTS=$(srcdir):$$TEXINPUTS $(LATEX) refcard.tex

diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index 5b51ef5..c536b12 100644 (file)
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -17528,6 +17528,13 @@ and `gnus-score-decay-scale'."
 Gnus \e$B$O0lF|$K0l2s%9%3%"$rIeGT$5$;$h$&$H$7$^$9!#Nc$($P!"$b$7\e(B gnus \e$B$r;MF|\e(B
 \e$B4V<B9T$7$F$$$J$$$H!"\e(Bgnus \e$B$O;M2s%9%3%"$rIe$i$;$^$9!#\e(B
 
+@iftex
+@iflatex
+@chapter Message
+@include message-ja.texi
+@end iflatex
+@end iftex
+
 @node Various
 @chapter \e$B$$$m$$$m\e(B
 

diff --git a/texi/infohack.el b/texi/infohack.el
index f487f9e..6485640 100644 (file)
--- a/texi/infohack.el
+++ b/texi/infohack.el
@@ -29,20 +29,30 @@
 
 (defun infohack-remove-unsupported ()
   (goto-char (point-min))
-  (while (re-search-forward "@\\(end \\)?ifnottex" nil t) 
-    (replace-match "")))
+  (while (re-search-forward "@\\(end \\)?ifnottex" nil t)
+    (replace-match ""))
+  (goto-char (point-min))
+  (while (search-forward "\n@iflatex\n" nil t)
+    (delete-region (1+ (match-beginning 0))
+                  (search-forward "\n@end iflatex\n"))))
 
 (defun infohack (file)
   (let ((dest-directory default-directory)
-       (max-lisp-eval-depth (max max-lisp-eval-depth 600)))
+       (max-lisp-eval-depth (max max-lisp-eval-depth 600))
+       coding-system)
     (find-file file)
+    (setq coding-system (if (boundp 'buffer-file-coding-system)
+                           buffer-file-coding-system
+                         file-coding-system))
     (infohack-remove-unsupported)
-    (texinfo-every-node-update) 
+    (texinfo-every-node-update)
     (texinfo-format-buffer t) ;; Don't save any file.
     (setq default-directory dest-directory)
-    (setq buffer-file-name 
+    (setq buffer-file-name
          (expand-file-name (file-name-nondirectory buffer-file-name)
                            default-directory))
+    (setq buffer-file-coding-system coding-system
+         file-coding-system coding-system)
     (if (> (buffer-size) 100000)
        (Info-split))
     (save-buffer)))