Changeset f933403

Timestamp:

Oct 3, 2003, 9:10:37 PM (21 years ago)

Author:

James M. Kretchmar <kretch@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:

12582d3

Parents:

2404c3a

Message:

Fix to make 'default' style the default again

Files:

• ChangeLog (modified) (1 diff)
• functions.c (modified) (30 diffs)
• owl.c (modified) (2 diffs)

ChangeLog

@@ -3 +3 @@
 2.0.8-pre-4
         Added the 'source' command.
+        Fix to make 'default' style the default again.
         
 2.0.8-pre-3   

functions.c

@@ -59 +59 @@
 }
 
-
 void owl_function_show_view(char *viewname)
 {
@@ -375 +374 @@
 }
 
-
 void owl_function_aimwrite(char *to)
 {
@@ -392 +390 @@
   }
 }
-
-
 
 /* If filter is non-null, looks for the next message matching
@@ -503 +499 @@
 }
 
-
 void owl_function_prevmsg()
 {
@@ -518 +513 @@
   owl_function_prevmsg_full(NULL, 1, 1);
 }
-
 
 void owl_function_nextmsg_personal()
@@ -559 +553 @@
   }
 }
-
 
 void owl_function_undeletecur(int move_after)
@@ -590 +583 @@
   owl_mainwin_redisplay(owl_global_get_mainwin(&g));
 }
-
 
 void owl_function_expunge()
@@ -627 +619 @@
   owl_mainwin_redisplay(owl_global_get_mainwin(&g));
 }
-
 
 void owl_function_firstmsg()
@@ -672 +663 @@
 }
 
-
 void owl_function_shift_left()
 {
@@ -688 +678 @@
 }
 
-
 void owl_function_unsuball()
 {
@@ -784 +773 @@
 }
 
-
 void owl_function_makemsg(char *fmt, ...)
 {
@@ -821 +809 @@
   va_end(ap);
 }
-
 
 void owl_function_openurl()
@@ -1038 +1025 @@
 }
 
-
 int owl_function_calculate_topmsg_normal(int direction, owl_view *v, int curmsg, int topmsg, int recwinlines)
 {
@@ -1104 +1090 @@
 }
 
-
 void owl_function_resize()
 {
   owl_global_set_resize_pending(&g);
 }
-
 
 void owl_function_run_buffercommand()
@@ -1156 +1140 @@
 }
 
-
 void owl_function_refresh()
 {
@@ -1169 +1152 @@
   }
 }
-
 
 void owl_function_subscribe(char *class, char *inst, char *recip)
@@ -1183 +1165 @@
 }
 
-
 void owl_function_unsubscribe(char *class, char *inst, char *recip)
 {
@@ -1196 +1177 @@
 }
 
-
 void owl_function_set_cursor(WINDOW *win)
 {
   wnoutrefresh(win);
 }
-
 
 void owl_function_full_redisplay()
@@ -1220 +1199 @@
   owl_global_set_needrefresh(&g);
 }
-
 
 void owl_function_popless_text(char *text)
@@ -1238 +1216 @@
   owl_global_set_needrefresh(&g);
 }
-
 
 void owl_function_popless_fmtext(owl_fmtext *fm)
@@ -1444 +1421 @@
 }
 
-
 /* print the current message in a popup window.
  * Use the 'default' style regardless of whatever
@@ -1474 +1450 @@
   owl_fmtext_free(&fm);
 }
-
 
 void owl_function_page_curmsg(int step)
@@ -1706 +1681 @@
 }
 
-
 void owl_function_status()
 {
@@ -1797 +1771 @@
   owl_fmtext_free(&fm);
 }
-
 
 /* if type = 0 then normal reply.
@@ -2061 +2034 @@
 }
 
-
 char *owl_function_perl(int argc, char **argv, char *buff, int type)
 {
@@ -2631 +2603 @@
 }
 
-
-
 void owl_function_color_current_filter(char *color)
 {
@@ -2746 +2716 @@
   }
 }
-
 
 void owl_function_show_keymaps()
@@ -2886 +2855 @@
   owl_function_makemsg("No matches found");
 }
-
 
 /* strips formatting from ztext and returns the unformatted text. 
@@ -3054 +3022 @@
 }
 
-
-
 void owl_function_do_newmsgproc(void)
 {
@@ -3185 +3151 @@
 }
 
-
 void owl_function_change_style(owl_view *v, char *stylename)
 {

owl.c

@@ -244 +244 @@
   }
 
-  /* set the startup and default style, based on userclue and presence of a
-   * formatting function */
-  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_global_set_default_style(&g, "default");
-  } else {
-    owl_global_set_default_style(&g, "basic");
-  }
-
   /* execute the startup function in the configfile */
   perlout = owl_perlconfig_execute("owl::startup();");
@@ -280 +270 @@
       owl_function_loadloginsubs(NULL);
     }
+  }
+
+  /* set the startup and default style, based on userclue and presence of a
+   * formatting function */
+  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_function_debugmsg("Here with default style\n");
+    owl_global_set_default_style(&g, "default");
+  } else {
+    owl_function_debugmsg("Here with basic style\n");
+    owl_global_set_default_style(&g, "basic");
   }