(dircategory): Delete obsolete mistaken `put'.

(texinfo-end-direntry): Output extra newline.
(texinfo-format-dircategory): Parse the arg and reinsert it by hand.

1 files changed, 7 insertions, 8 deletions

diff --git a/lisp/textmodes/texinfmt.el b/lisp/textmodes/texinfmt.el
index 0ecaa91a7c5..9976824403b 100644
--- a/lisp/textmodes/texinfmt.el
+++ b/lisp/textmodes/texinfmt.el
@@ -2382,17 +2382,17 @@ If used within a line, follow `@bullet' with braces."
 (put 'direntry 'texinfo-end 'texinfo-end-direntry)
 (defun texinfo-end-direntry ()
   (texinfo-discard-command)
-  (insert "END-INFO-DIR-ENTRY\n")
+  (insert "END-INFO-DIR-ENTRY\n\n")
   (texinfo-pop-stack 'direntry))
 
 (put 'dircategory 'texinfo-format 'texinfo-format-dircategory)
 (defun texinfo-format-dircategory ()
-  (texinfo-discard-command)
-  (delete-region (point)
-                 (progn
-                  (skip-chars-forward " ")
-                  (point)))
-  (insert "INFO-DIR-SECTION "))
+  (let ((str (texinfo-parse-arg-discard)))
+    (delete-region (point)
+                   (progn
+                     (skip-chars-forward " ")
+                     (point)))
+    (insert "INFO-DIR-SECTION " str "\n")))
 
 ;;; @cartouche 
 
@@ -3964,7 +3964,6 @@ the @ifeq command."
 (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 'dircategory 'texinfo-format 'texinfo-discard-line-with-args)
 
 
 ;;; Some commands cannot be handled