commit bash-20080911 snapshot

builtins/bind.def

@@ -115,7 +115,10 @@ bind_builtin (list)
   char *initfile, *map_name, *fun_name, *unbind_name, *remove_seq, *cmd_seq;
 
   if (no_line_editing)
-    return (EXECUTION_FAILURE);
+    {
+      builtin_error ("line editing not enabled");
+      return (EXECUTION_FAILURE);
+    }
 
   kmap = saved_keymap = (Keymap) NULL;
   flags = 0;

builtins/bind.def~

@@ -5,19 +5,18 @@ Copyright (C) 1987-2008 Free Software Foundation, Inc.
 
 This file is part of GNU Bash, the Bourne Again SHell.
 
-Bash is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free
-Software Foundation; either version 2, or (at your option) any later
-version.
+Bash is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
-Bash is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-for more details.
+Bash is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
-with Bash; see the file COPYING.  If not, write to the Free Software
-Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA.
+You should have received a copy of the GNU General Public License
+along with Bash.  If not, see <http://www.gnu.org/licenses/>.
 
 $PRODUCES bind.c
 
@@ -55,6 +54,9 @@ Options:
   -f  filename       Read key bindings from FILENAME.
   -x  keyseq:shell-command	Cause SHELL-COMMAND to be executed when
 				KEYSEQ is entered.
+
+Exit Status:
+bind returns 0 unless an unrecognized option is given or an error occurs.
 $END
 
 #if defined (READLINE)

builtins/return.def

@@ -47,6 +47,7 @@ $END
 
 #include "../shell.h"
 #include "common.h"
+#include "bashgetopt.h"
 
 extern int last_command_exit_value;
 extern int subshell_environment;
@@ -59,6 +60,10 @@ int
 return_builtin (list)
      WORD_LIST *list;
 {
+  if (no_options (list))
+    return (EX_USAGE);
+  list = loptend;	/* skip over possible `--' */
+
   return_catch_value = get_exitstat (list);
 
   if (return_catch_flag)