epa.texi (Caching Passphrases): Don't give argument to @item used in

 @enumerate section so as to be able to be formatted with MAKEINFO=no.

infohack.el (infohack-replace-unsupported): Fix last commit.

diff --git a/texi/ChangeLog b/texi/ChangeLog
index ea20ccf..3ea04be 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,5 +1,8 @@
 2014-02-10  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 2014-02-10  Katsumi Yamaoka  <yamaoka@jpl.org>
 

+       * epa.texi (Caching Passphrases): Don't give argument to @item used in
+       @enumerate section so as to be able to be formatted with MAKEINFO=no.
+

        * infohack.el (texinfo-format-comma): Support @comma.
        (infohack-replace-unsupported): New function.
        (infohack): Use it.
        * infohack.el (texinfo-format-comma): Support @comma.
        (infohack-replace-unsupported): New function.
        (infohack): Use it.

diff --git a/texi/epa.texi b/texi/epa.texi
index 0c8c315..5d957dd 100644 (file)
--- a/texi/epa.texi
+++ b/texi/epa.texi
@@ -447,9 +447,12 @@ GnuPG version 2), encryption method (symmetric or public key), and whether or
 not you want to use gpg-agent.  Here are some questions:
 
 @enumerate
 not you want to use gpg-agent.  Here are some questions:
 
 @enumerate

-@item Do you use GnuPG version 2 instead of GnuPG version 1?
-@item Do you use symmetric encryption rather than public key encryption?
-@item Do you want to use gpg-agent?
+@item
+Do you use GnuPG version 2 instead of GnuPG version 1?
+@item
+Do you use symmetric encryption rather than public key encryption?
+@item
+Do you want to use gpg-agent?

 @end enumerate
 
 Here are configurations depending on your answers:
 @end enumerate
 
 Here are configurations depending on your answers:

diff --git a/texi/infohack.el b/texi/infohack.el
index e2ca0a7..f4d468d 100644 (file)
--- a/texi/infohack.el
+++ b/texi/infohack.el
@@ -115,15 +115,7 @@ which are indicated by the @copying ... @end copying command."
 (defun infohack-replace-unsupported ()
   (goto-char (point-min))
   (while (search-forward "@indicateurl{" nil t)
 (defun infohack-replace-unsupported ()
   (goto-char (point-min))
   (while (search-forward "@indicateurl{" nil t)

-    (replace-match "@url{"))
-  (goto-char (point-min))
-  (while (search-forward "@enumerate" nil t)
-    (narrow-to-region (point)
-                     (or (re-search-forward "@end[\t ]+enumerate" nil t)
-                         (point-max)))
-    (goto-char (point-min))
-    (while (re-search-forward "@item[\t ]+\\([^\t\n ]\\)" nil t)
-      (replace-match "@item\n\\1"))))
+    (replace-match "@url{")))

 
 (defun infohack-include-files ()
   "Insert @include files."
 
 (defun infohack-include-files ()
   "Insert @include files."