[Emacs-diffs] Changes to emacs/lisp/textmodes/texinfmt.el

[Juanma Barranquero]

Index: emacs/lisp/textmodes/texinfmt.el
diff -c emacs/lisp/textmodes/texinfmt.el:1.57 
emacs/lisp/textmodes/texinfmt.el:1.58
*** emacs/lisp/textmodes/texinfmt.el:1.57       Sat Mar  9 15:11:34 2002
--- emacs/lisp/textmodes/texinfmt.el    Tue Oct 29 02:53:08 2002
***************
*** 2129,2135 ****
      (setq fill-column existing-fill-column)))
  
  
! ;;; @ifinfo,  @iftex, @tex, @ifhtml, @html, @ifnottex, @ifnotinfo, @ifnothtml
  
  (put 'ifinfo 'texinfo-format 'texinfo-discard-line)
  (put 'ifinfo 'texinfo-end 'texinfo-discard-command)
--- 2129,2136 ----
      (setq fill-column existing-fill-column)))
  
  
! ;;; @ifinfo,  @iftex, @tex, @ifhtml, @html, @ifplaintext
! ;;  @ifnottex, @ifnotinfo, @ifnothtml, @ifnotplaintext
  
  (put 'ifinfo 'texinfo-format 'texinfo-discard-line)
  (put 'ifinfo 'texinfo-end 'texinfo-discard-command)
***************
*** 2146,2151 ****
--- 2147,2158 ----
                   (progn (re-search-forward "@end ifhtml[ \t]*\n")
                          (point))))
  
+ (put 'ifplaintext 'texinfo-format 'texinfo-format-ifplaintext)
+ (defun texinfo-format-ifplaintext ()
+   (delete-region texinfo-command-start
+                  (progn (re-search-forward "@end ifplaintext[ \t]*\n")
+                         (point))))
+ 
  (put 'tex 'texinfo-format 'texinfo-format-tex)
  (defun texinfo-format-tex ()
    (delete-region texinfo-command-start
***************
*** 2164,2169 ****
--- 2171,2179 ----
                   (progn (re-search-forward "@end ifnotinfo[ \t]*\n")
                          (point))))
  
+ (put 'ifnotplaintext 'texinfo-format 'texinfo-discard-line)
+ (put 'ifnotplaintext 'texinfo-end 'texinfo-discard-command)
+ 
  (put 'ifnottex 'texinfo-format 'texinfo-discard-line)
  (put 'ifnottex 'texinfo-end 'texinfo-discard-command)
  
***************
*** 4084,4089 ****
--- 4094,4103 ----
  (put 'smallbreak 'texinfo-format 'texinfo-discard-line)
  (put 'medbreak 'texinfo-format 'texinfo-discard-line)
  (put 'bigbreak 'texinfo-format 'texinfo-discard-line)
+ (put 'afourpaper 'texinfo-format 'texinfo-discard-line)
+ (put 'afivepaper 'texinoo-format 'texinfo-discard-line)
+ (put 'afourlatex 'texinoo-format 'texinfo-discard-line)
+ (put 'afourwide  'texinoo-format 'texinfo-discard-line)
  
  
  ;;; These noop commands discard the rest of the line.
***************
*** 4125,4130 ****
--- 4139,4148 ----
  (put 'shorttitlepage 'texinfo-format 'texinfo-discard-line-with-args)
  (put 'summarycontents 'texinfo-format 'texinfo-discard-line-with-args)
  (put 'input 'texinfo-format 'texinfo-discard-line-with-args)
+ 
+ (put 'documentlanguage 'texinfo-format 'texinfo-discard-line-with-args)
+ (put 'documentencoding 'texinfo-format 'texinfo-discard-line-with-args)
+ 
  
  
  ;;; Some commands cannot be handled