Synch to Wanderlust 200407200944.

diff --git a/ChangeLog b/ChangeLog
index db61e9e..65481e0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-07-20  TAKAHASHI Kaoru  <kaoru@kaisei.org>
+
+       * texi/ptexinfmt.el: Support @s.
+
 2004-06-21  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * lisp/nnheader.el (nnheader-parse-nov): Pass the eol value to

diff --git a/texi/ptexinfmt.el b/texi/ptexinfmt.el
index 136bae2..071d00f 100644 (file)
--- a/texi/ptexinfmt.el
+++ b/texi/ptexinfmt.el
@@ -36,6 +36,21 @@
 
 ;; Modified by Yamaoka not to use APEL functions.
 
+;; Unimplemented command:
+;;  @float, @caption, @shortcaption, @listoffloats
+;;  @deftypecv[x]
+;;  @headitem
+;;  @comma{}
+;;  @quotation (optional arguments)
+;;  @acronym (optional argument)
+;;  @dofirstparagraphindent
+;;  @indent
+;;  @verbatiminclude
+;;  @\
+;;  @definfoenclose
+;;  @deftypeivar
+;;  @deftypeop
+
 ;;; Code:
 
 (require 'backquote)
@@ -195,6 +210,9 @@ DOCSTRING will be printed if ASSERTION is nil and
 (put 'page 'texinfo-format 'texinfo-discard-line)
 (put 'hyphenation 'texinfo-format 'texinfo-discard-command-and-arg)
 
+;; @s{} (makeinfo 4.8 or later)
+(put 's 'texinfo-format 'texinfo-format-noop)
+
 ;; @tie{} (makeinfo 4.3 or later)
 (put 'tie 'texinfo-format 'texinfo-format-tie)
 (ptexinfmt-defun-if-void texinfo-format-tie ()