REPL Server: Don't establish a SIGINT handler.

[bpt/guile.git] / libguile / options.c

diff --git a/libguile/options.c b/libguile/options.c
index cc3d452..0e08314 100644 (file)
--- a/libguile/options.c
+++ b/libguile/options.c
@@ -1,18 +1,19 @@
-/* Copyright (C) 1995,1996,1998,2000,2001, 2006, 2008 Free Software Foundation
+/* Copyright (C) 1995,1996,1998,2000,2001, 2006, 2008, 2009, 2010 Free Software Foundation
  * 
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 3 of
+ * the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library 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
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
  */
 
 \f
@@ -23,7 +24,6 @@
 #include "libguile/_scm.h"
 #include "libguile/mallocs.h"
 #include "libguile/strings.h"
-#include "libguile/lang.h"
 
 #include "libguile/options.h"
 \f
@@ -148,7 +148,7 @@ get_documented_option_setting (const scm_t_option options[])
       ls = scm_cons (SCM_PACK (options[i].name), ls);
       ans = scm_cons (ls, ans);
     }
-  return ans;
+  return scm_reverse_x (ans, SCM_UNDEFINED);
 }
 
 
@@ -280,7 +280,6 @@ scm_init_opts (SCM (*func) (SCM), scm_t_option options[])
     {
       SCM name = scm_from_locale_symbol (options[i].name);
       options[i].name =        (char *) SCM_UNPACK (name);
-      scm_permanent_object (name);
     }
   func (SCM_UNDEFINED);
 }