From a831084b365c91725c12bbdeb67fb309b8b8d00c Mon Sep 17 00:00:00 2001
From: Sergey Poznyakoff <gray@gnu.org.ua>
Date: Sat, 21 Jan 2006 19:06:40 +0000
Subject: [PATCH] (usage_long_opt): Do not print DOC options.
 (__argp_base_name): Removed

---
 lib/argp-help.c | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/lib/argp-help.c b/lib/argp-help.c
index d3ad4c3310..83962d3c14 100644
--- a/lib/argp-help.c
+++ b/lib/argp-help.c
@@ -50,7 +50,6 @@
 #include "argp.h"
 #include "argp-fmtstream.h"
 #include "argp-namefrob.h"
-#include "dirname.h"
 
 #ifndef SIZE_MAX
 # define SIZE_MAX ((size_t) -1)
@@ -1305,7 +1304,7 @@ usage_long_opt (const struct argp_option *opt,
   if (! arg)
     arg = real->arg;
 
-  if (! (flags & OPTION_NO_USAGE))
+  if (! (flags & OPTION_NO_USAGE) && !odoc (opt))
     {
       if (arg)
 	{
@@ -1714,15 +1713,6 @@ void __argp_help (const struct argp *argp, FILE *stream,
 weak_alias (__argp_help, argp_help)
 #endif
 
-char *
-__argp_base_name (char *name)
-{
-  char *p;
-  for (p = name + strlen (name); p > name && !ISSLASH (p[-1]); p--)
-    ;
-  return p;
-}
-     
 #if ! (defined _LIBC || HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME)
 char *
 __argp_short_program_name (void)
-- 
2.30.2