* gsubr.c (scm_gsubr_apply): Added dummy return to avoid compiler
[bpt/guile.git] / libguile / srcprop.c
index d52cb3a..195b699 100644 (file)
@@ -1,4 +1,4 @@
-/*     Copyright (C) 1995,1996 Free Software Foundation
+/*     Copyright (C) 1995,1996, 1997 Free Software Foundation
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -114,11 +114,11 @@ prinsrcprops (obj, port, pstate)
      scm_print_state *pstate;
 {
   int writingp = SCM_WRITINGP (pstate);
-  scm_gen_puts (scm_regular_string, "#<srcprops ", port);
+  scm_puts ("#<srcprops ", port);
   SCM_SET_WRITINGP (pstate, 1);
   scm_iprin1 (scm_srcprops_to_plist (obj), port, pstate);
   SCM_SET_WRITINGP (pstate, writingp);
-  scm_gen_putc ('>', port);
+  scm_putc ('>', port);
   return 1;
 }
 
@@ -284,18 +284,26 @@ scm_set_source_property_x (obj, key, datum)
       p = SCM_EOL;
     }
   if (scm_i_breakpoint == key)
-    if (SCM_FALSEP (datum))
-      CLEARSRCPROPBRK (SCM_NIMP (p) && SRCPROPSP (p)
+    {
+      if (SCM_FALSEP (datum))
+       CLEARSRCPROPBRK (SCM_NIMP (p) && SRCPROPSP (p)
+                        ? p
+                        : SCM_WHASHSET (scm_source_whash, h,
+                                        scm_make_srcprops (0,
+                                                           0,
+                                                           SCM_UNDEFINED,
+                                                           SCM_UNDEFINED,
+                                                           p)));
+      else
+       SETSRCPROPBRK (SCM_NIMP (p) && SRCPROPSP (p)
                       ? p
                       : SCM_WHASHSET (scm_source_whash, h,
-                                  scm_make_srcprops (0, 0, SCM_UNDEFINED,
-                                                      SCM_UNDEFINED, p)));
-    else
-      SETSRCPROPBRK (SCM_NIMP (p) && SRCPROPSP (p)
-                    ? p
-                    : SCM_WHASHSET (scm_source_whash, h,
-                                scm_make_srcprops (0, 0, SCM_UNDEFINED,
-                                                    SCM_UNDEFINED, p)));
+                                      scm_make_srcprops (0,
+                                                         0,
+                                                         SCM_UNDEFINED,
+                                                         SCM_UNDEFINED,
+                                                         p)));
+    }
   else if (scm_i_line == key)
     {
       if (SCM_NIMP (p) && SRCPROPSP (p))