(texinfo-format-ifnotinfo): New function.

(ifnothtml): New alias.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f6dc581ccfc5ba0d0a02cd4de3fa3412741b169e..246fb54383abf06936c50ea71b5161355268fd66 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-28  Masayuki Ataka  <ataka@milk.freemail.ne.jp>
+
+       * textmodes/texinfmt.el (texinfo-format-ifnotinfo): New function.
+       (ifnothtml): New alias.
+
 2001-10-27  Stefan Monnier  <monnier@cs.yale.edu>
 
        * mail/sendmail.el (mail-mode): Fix ordering in adaptive-fill-regexp.

diff --git a/lisp/textmodes/texinfmt.el b/lisp/textmodes/texinfmt.el
index 01f49921b4ce05bedf872b535984fc7c73749b46..1de77246b28be0a718db8a01534016ed389a8660 100644 (file)
--- a/lisp/textmodes/texinfmt.el
+++ b/lisp/textmodes/texinfmt.el
@@ -2129,7 +2129,7 @@ This command is executed when texinfmt sees @item inside @multitable."
     (setq fill-column existing-fill-column)))
 
 \f
-;;; @ifinfo,  @iftex, @tex, @ifhtml, @html, @ifnottex
+;;; @ifinfo,  @iftex, @tex, @ifhtml, @html, @ifnottex, @ifnotinfo, @ifnothtml
 
 (put 'ifinfo 'texinfo-format 'texinfo-discard-line)
 (put 'ifinfo 'texinfo-end 'texinfo-discard-command)
@@ -2158,9 +2158,18 @@ This command is executed when texinfmt sees @item inside @multitable."
                  (progn (re-search-forward "@end html[ \t]*\n")
                         (point))))
 
+(put 'ifnotinfo 'texinfo-format 'texinfo-format-ifnotinfo)
+(defun texinfo-format-ifnotinfo ()
+  (delete-region texinfo-command-start
+                 (progn (re-search-forward "@end ifnotinfo[ \t]*\n")
+                        (point))))
+
 (put 'ifnottex 'texinfo-format 'texinfo-discard-line)
 (put 'ifnottex 'texinfo-end 'texinfo-discard-command)
 
+(put 'ifnothtml 'texinfo-format 'texinfo-discard-line)
+(put 'ifnothtml 'texinfo-end 'texinfo-discard-command)
+
 \f
 ;;; @titlepage