(texinfo-no-refill-regexp): Add "direntry".

(texinfo-format-direntry, texinfo-end-direntry): New functions.
(texinfo-format-dircategory): New function.

lisp/textmodes/texinfmt.el

@@ -467,6 +467,7 @@ Info-split to do these manually."
   (concat
    "^@"
    "\\("
+   "direntry\\|"
    "example\\|"
    "smallexample\\|"
    "lisp\\|"
@@ -2370,6 +2371,29 @@ If used within a line, follow `@bullet' with braces."
     (insert "\n     ")))
 
 
+;; @direntry and @dircategory
+
+(put 'direntry 'texinfo-format 'texinfo-format-direntry)
+(defun texinfo-format-direntry ()
+  (texinfo-push-stack 'direntry nil)
+  (texinfo-discard-line)
+  (insert "START-INFO-DIR-ENTRY\n\n"))
+
+(put 'direntry 'texinfo-end 'texinfo-end-direntry)
+(defun texinfo-end-direntry ()
+  (texinfo-discard-command)
+  (insert "END-INFO-DIR-ENTRY\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 "))
+
 ;;; @cartouche 
 
 ;; The @cartouche command is a noop in Info; in a printed manual,