Changeset 27c3a93


Ignore:
Timestamp:
Oct 17, 2003, 8:55:32 PM (17 years ago)
Author:
Erik Nygren <nygren@mit.edu>
Branches:
master, barnowl_perlaim, debian, owl, 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:
5 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    r6a50af2 r27c3a93  
    11$Id$
    22
     32.0.9-pre-2
     4        Better reporting of perl errors (both into the errqueue
     5                and also clearing the error after displaying it).
     6        Allow default_style to be specified in config.
     7       
    382.0.9-pre-1
    49        Added errqueue
  • owl.c

    rec6ff52 r27c3a93  
    279279  /* set the startup and default style, based on userclue and presence of a
    280280   * formatting function */
    281   if (owl_global_is_config_format(&g)) {
     281  if (0 != strcmp(owl_global_get_default_style(&g), "__unspecified__")) {
     282    /* the style was set by the user: leave it alone */
     283  } else if (owl_global_is_config_format(&g)) {
    282284    owl_global_set_default_style(&g, "perl");
    283285  } else if (owl_global_is_userclue(&g, OWL_USERCLUE_CLASSES)) {
  • owl.h

    rec6ff52 r27c3a93  
    2121static const char owl_h_fileIdent[] = "$Id$";
    2222
    23 #define OWL_VERSION         2.0.9-pre-1
    24 #define OWL_VERSION_STRING "2.0.9-pre-1"
     23#define OWL_VERSION         2.0.9-pre-2
     24#define OWL_VERSION_STRING "2.0.9-pre-2"
    2525
    2626#define OWL_DEBUG 0
  • perlconfig.c

    rf1e629d r27c3a93  
    121121  if (SvTRUE(ERRSV)) {
    122122    STRLEN n_a;
    123     owl_function_makemsg("Perl Error: '%s'", SvPV(ERRSV, n_a));
     123    owl_function_error("Perl Error: '%s'", SvPV(ERRSV, n_a));
     124    /* and clear the error */
     125    sv_setsv (ERRSV, &PL_sv_undef);
    124126  }
    125127
     
    178180  if (ret || SvTRUE(ERRSV)) {
    179181    STRLEN n_a;
    180     return owl_strdup(SvPV(ERRSV, n_a));
     182    char *err;
     183    err = owl_strdup(SvPV(ERRSV, n_a));
     184    sv_setsv (ERRSV, &PL_sv_undef);     /* and clear the error */
     185    return err;
    181186  }
    182187
     
    184189  if (ret || SvTRUE(ERRSV)) {
    185190    STRLEN n_a;
    186     return owl_strdup(SvPV(ERRSV, n_a));
     191    char *err;
     192    err = owl_strdup(SvPV(ERRSV, n_a));
     193    sv_setsv (ERRSV, &PL_sv_undef);     /* and clear the error */
     194    return err;
    187195  }
    188196
     
    207215  if (SvTRUE(ERRSV)) {
    208216    STRLEN n_a;
    209     return owl_strdup(SvPV(ERRSV, n_a));
     217    char *err;
     218    err = owl_strdup(SvPV(ERRSV, n_a));
     219    sv_setsv (ERRSV, &PL_sv_undef);     /* and clear the error */
     220    return err;
    210221  }
    211222
     
    257268  if (SvTRUE(ERRSV)) {
    258269    STRLEN n_a;
    259     owl_function_makemsg("Perl Error: '%s'", SvPV(ERRSV, n_a));
     270    owl_function_error("Perl Error: '%s'", SvPV(ERRSV, n_a));
     271    sv_setsv (ERRSV, &PL_sv_undef);     /* and clear the error */
    260272  }
    261273
  • variable.c

    r836ea3a3 r27c3a93  
    202202                      NULL, owl_variable_tty_set, NULL),
    203203
    204   OWLVAR_STRING( "default_style" /* %OwlVarStub */, "default",
     204  OWLVAR_STRING( "default_style" /* %OwlVarStub */, "__unspecified__",
    205205                 "name of the default formatting style",
    206206                 "This sets the default message formatting style.\n"
Note: See TracChangeset for help on using the changeset viewer.