Changes in variable.c [66e409c:d544237]

File:

• variable.c (modified) (8 diffs)

variable.c

@@ -110 +110 @@
 
   OWLVAR_ENUM( "loggingdirection" /* %OwlVarStub */, OWL_LOGGING_DIRECTION_BOTH,
-               "specifices which kind of messages should be logged",
+               "specifies which kind of messages should be logged",
                "Can be one of 'both', 'in', or 'out'.  If 'in' is\n"
                "selected, only incoming messages are logged, if 'out'\n"
@@ -138 +138 @@
                     "location of users in your .anyone file.  If a user is present\n"
                     "but sent no login message, or a user is not present that sent no\n"
-                    "logout message, a pseudo login or logout message wil be created\n",
+                    "logout message, a pseudo login or logout message will be created\n",
                     NULL, owl_variable_pseudologins_set, NULL),
 
@@ -151 +151 @@
 
                  "If non empty, any messages matching the given filter will be logged.\n"
-                 "This is a completely separate mechanisim from the other logging\n"
+                 "This is a completely separate mechanism from the other logging\n"
                  "variables like logging, classlogging, loglogins, loggingdirection,\n"
                  "etc.  If you want this variable to control all logging, make sure\n"
@@ -198 +198 @@
   OWLVAR_PATH( "newmsgproc" /* %OwlVarStub:newmsgproc */, NULL,
                "name of a program to run when new messages are present",
-               "The named program will be run when owl recevies new.\n"
+               "The named program will be run when owl receives new\n"
                "messages.  It will not be run again until the first\n"
                "instance exits"),
@@ -213 +213 @@
                  "Called every time you start a zephyrgram without an\n"
                  "explicit zsig.  The default setting implements the policy\n"
-                 "descripted in the documentation for the 'zsig' variable.\n"),
+                 "described in the documentation for the 'zsig' variable.\n"),
 
   OWLVAR_STRING( "zsig" /* %OwlVarStub */, "",
@@ -280 +280 @@
 
   OWLVAR_INT(    "edit:maxfillcols" /* %OwlVarStub:edit_maxfillcols */, 70,
-                 "maximum number of columns for M-q to fill text to",
-                 "This specifies the maximum number of columns for M-q\n"
-                 "to fill text to.  If set to 0, ther will be no maximum\n"
-                 "limit.  In all cases, the current width of the screen\n"
-                 "will also be taken into account.  It will be used instead\n"
-                 "if it is narrower than the maximum, or if this\n"
-                 "is set to 0.\n" ),
-
-  OWLVAR_INT(    "edit:maxwrapcols" /* %OwlVarStub:edit_maxwrapcols */, 0,
+                 "maximum number of columns for M-q (edit:fill-paragraph) to fill text to",
+                 "This specifies the maximum number of columns for M-q to fill text\n"
+                 "to.  If set to 0, M-q will wrap to the width of the window, and\n"
+                 "values less than 0 disable M-q entirely.\n"),
+
+  OWLVAR_INT(    "edit:maxwrapcols" /* %OwlVarStub:edit_maxwrapcols */, 70,
                  "maximum number of columns for line-wrapping",
-                 "This specifies the maximum number of columns for\n"
-                 "auto-line-wrapping.  If set to 0, ther will be no maximum\n"
-                 "limit.  In all cases, the current width of the screen\n"
-                 "will also be taken into account.  It will be used instead\n"
-                 "if it is narrower than the maximum, or if this\n"
-                 "is set to 0.\n\n"
-                 "It is recommended that outgoing messages be no wider\n"
-                 "than 60 columns, as a courtesy to recipients.\n"),
+                 "This specifies the maximum number of columns for\n"
+                 "auto-line-wrapping.  If set to 0, text will be wrapped at the\n"
+                 "window width. Values less than 0 disable automatic wrapping.\n"
+                 "\n"
+                 "As a courtesy to recipients, it is recommended that outgoing\n"
+                 "Zephyr messages be no wider than 70 columns.\n"),
 
   OWLVAR_INT( "aim_ignorelogin_timer" /* %OwlVarStub */, 15,
               "number of seconds after AIM login to ignore login messages",
               "This specifies the number of seconds to wait after an\n"
-              "AIM login before allowing the recipt of AIM login notifications.\n"
+              "AIM login before allowing the receipt of AIM login notifications.\n"
               "By default this is set to 15.  If you would like to view login\n"
               "notifications of buddies as soon as you login, set it to 0 instead."),
@@ -405 +400 @@
   int rv;
   rv = owl_variable_int_set_default(v, newval);
-  if (0 == rv) owl_function_resize();
+  if (0 == rv) owl_global_set_relayout_pending(&g);
   return(rv);
 }
@@ -433 +428 @@
 int owl_variable_pseudologins_set(owl_variable *v, const void *newval)
 {
+  static owl_timer *timer = NULL;
   if (newval) {
     if (*(const int*)newval == 1) {
       owl_function_zephyr_buddy_check(0);
+      if (timer == NULL) {
+        timer = owl_select_add_timer(180, 180, owl_zephyr_buddycheck_timer, NULL, NULL);
+      }
+    } else {
+      if (timer != NULL) {
+        owl_select_remove_timer(timer);
+        timer = NULL;
+      }
     }
   }