(usage_long_opt): Do not print DOC options.

(__argp_base_name): Removed

diff --git a/lib/argp-help.c b/lib/argp-help.c
index d3ad4c33104c821e85c3d53082e6de7b01f8b1b1..83962d3c14298bb8094d2b258e6a280ff477be6a 100644 (file)
--- 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)