* utils/ptexinfmt.el (documentlanguage, documentencoding): Fixed probrem.

diff --git a/ChangeLog b/ChangeLog
index 3151d07..1d1fa5a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 
        * WL-MK (wl-texinfo-format-file): require ptexinfmt.
        * utils/ptexinfmt.el: provide feature.
+       (documentlanguage, documentencoding): Fixed probrem.
 
 2000-07-13  TAKAHASHI Kaoru  <kaoru@kaisei.org>
 

diff --git a/WL-MK b/WL-MK
index 69f899e..61b1db5 100644 (file)
--- a/WL-MK
+++ b/WL-MK
@@ -245,10 +245,10 @@
     (or (file-newer-than-file-p (expand-file-name infofile DOCDIR)
                                (expand-file-name texifile DOCDIR))
        (let (obuf beg)
-         (find-file (expand-file-name texifile DOCDIR))
-         (setq obuf (current-buffer))
          ;; Support old texinfmt.el
          (require 'ptexinfmt (expand-file-name "ptexinfmt.el" UTILSDIR))
+         (find-file (expand-file-name texifile DOCDIR))
+         (setq obuf (current-buffer))
          ;; We can't know file names if splitted.
          (texinfo-format-buffer t)
          ;; Emacs20.2's default is 'raw-text-unix.

diff --git a/utils/ptexinfmt.el b/utils/ptexinfmt.el
index 127c8b5..a465914 100644 (file)
--- a/utils/ptexinfmt.el
+++ b/utils/ptexinfmt.el
@@ -205,8 +205,8 @@ otherwise, insert URL-TITLE followed by URL in parentheses."
       (texinfo-discard-command))))
 
 ;;; misc.
-(put 'documentlanguage 'texinfo-format 'texinfo-discard-line)
-(put 'documentencoding 'texinfo-format 'texinfo-discard-line)
+(put 'documentlanguage 'texinfo-format 'texinfo-discard-line-with-args)
+(put 'documentencoding 'texinfo-format 'texinfo-discard-line-with-args)
 (put 'smallbook 'texinfo-format 'texinfo-discard-line)
 (put 'overfullrule 'texinfo-format 'texinfo-discard-line)
 (put 'smallbreak 'texinfo-format 'texinfo-discard-line)