From: Katsumi Yamaoka <yamaoka@jpl.org>
Date: Mon, 10 Feb 2014 06:22:31 +0000 (+0000)
Subject: epa.texi (Caching Passphrases): Don't give argument to @item used in
X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=commitdiff_plain;h=9e4c70bf8f04e19629abe9eba9b12dac47a47060

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 ea20ccf2e..3ea04be93 100644
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,5 +1,8 @@
 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.
diff --git a/texi/epa.texi b/texi/epa.texi
index 0c8c31547..5d957ddfc 100644
--- 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
-@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:
diff --git a/texi/infohack.el b/texi/infohack.el
index e2ca0a79c..f4d468d51 100644
--- 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)
-    (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."