Changeset 27c3a93

Timestamp:

Oct 17, 2003, 8:55:32 PM (21 years ago)

Author:

Erik Nygren <nygren@mit.edu>

Branches:

master, barnowl_perlaim, debian, owl, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

2a2bb60

Parents:

b4db911

Message:

2.0.9-pre-2
	Better reporting of perl errors (both into the errqueue
	        and also clearing the error after displaying it).
	Allow default_style to be specified in config.

Files:

• ChangeLog (modified) (1 diff)
• owl.c (modified) (1 diff)
• owl.h (modified) (1 diff)
• perlconfig.c (modified) (5 diffs)
• variable.c (modified) (1 diff)

ChangeLog

@@ -1 +1 @@
 $Id$
 
+2.0.9-pre-2
+        Better reporting of perl errors (both into the errqueue
+                and also clearing the error after displaying it).
+        Allow default_style to be specified in config.
+        
 2.0.9-pre-1
         Added errqueue

owl.c

@@ -279 +279 @@
   /* set the startup and default style, based on userclue and presence of a
    * formatting function */
-  if (owl_global_is_config_format(&g)) {
+  if (0 != strcmp(owl_global_get_default_style(&g), "__unspecified__")) {
+    /* the style was set by the user: leave it alone */
+  } else if (owl_global_is_config_format(&g)) {
     owl_global_set_default_style(&g, "perl");
   } else if (owl_global_is_userclue(&g, OWL_USERCLUE_CLASSES)) {

owl.h

@@ -21 +21 @@
 static const char owl_h_fileIdent[] = "$Id$";
 
-#define OWL_VERSION         2.0.9-pre-1
-#define OWL_VERSION_STRING "2.0.9-pre-1"
+#define OWL_VERSION         2.0.9-pre-2
+#define OWL_VERSION_STRING "2.0.9-pre-2"
 
 #define OWL_DEBUG 0

perlconfig.c

@@ -121 +121 @@
   if (SvTRUE(ERRSV)) {
     STRLEN n_a;
-    owl_function_makemsg("Perl Error: '%s'", SvPV(ERRSV, n_a));
+    owl_function_error("Perl Error: '%s'", SvPV(ERRSV, n_a));
+    /* and clear the error */
+    sv_setsv (ERRSV, &PL_sv_undef);
   }
 
@@ -178 +180 @@
   if (ret || SvTRUE(ERRSV)) {
     STRLEN n_a;
-    return owl_strdup(SvPV(ERRSV, n_a));
+    char *err;
+    err = owl_strdup(SvPV(ERRSV, n_a));
+    sv_setsv (ERRSV, &PL_sv_undef);     /* and clear the error */
+    return err;
   }
 
@@ -184 +189 @@
   if (ret || SvTRUE(ERRSV)) {
     STRLEN n_a;
-    return owl_strdup(SvPV(ERRSV, n_a));
+    char *err;
+    err = owl_strdup(SvPV(ERRSV, n_a));
+    sv_setsv (ERRSV, &PL_sv_undef);     /* and clear the error */
+    return err;
   }
 
@@ -207 +215 @@
   if (SvTRUE(ERRSV)) {
     STRLEN n_a;
-    return owl_strdup(SvPV(ERRSV, n_a));
+    char *err;
+    err = owl_strdup(SvPV(ERRSV, n_a));
+    sv_setsv (ERRSV, &PL_sv_undef);     /* and clear the error */
+    return err;
   }
 
@@ -257 +268 @@
   if (SvTRUE(ERRSV)) {
     STRLEN n_a;
-    owl_function_makemsg("Perl Error: '%s'", SvPV(ERRSV, n_a));
+    owl_function_error("Perl Error: '%s'", SvPV(ERRSV, n_a));
+    sv_setsv (ERRSV, &PL_sv_undef);     /* and clear the error */
   }
 

variable.c

@@ -202 +202 @@
                       NULL, owl_variable_tty_set, NULL),
 
-  OWLVAR_STRING( "default_style" /* %OwlVarStub */, "default",
+  OWLVAR_STRING( "default_style" /* %OwlVarStub */, "__unspecified__",
                  "name of the default formatting style",
                  "This sets the default message formatting style.\n"