smartIndent-remove-statics.patch

   1 ---
   2
   3  source/smartIndent.c |   12 +++---------
   4  1 files changed, 3 insertions(+), 9 deletions(-)
   5
   6 diff --quilt old/source/smartIndent.c new/source/smartIndent.c
   7 --- old/source/smartIndent.c
   8 +++ new/source/smartIndent.c
   9 @@ -816,12 +816,11 @@ void SmartIndentCB(Widget w, XtPointer c
  10  */
  11  static void executeNewlineMacro(WindowInfo *window, smartIndentCBStruct *cbInfo)
  12  {
  13      windowSmartIndentData *winData =
  14             (windowSmartIndentData *)window->smartIndentData;
  15 -    /* posValue probably shouldn't be static due to re-entrance issues <slobasso> */
  16 -    static DataValue posValue = {INT_TAG, {0}};
  17 +    DataValue posValue = {INT_TAG, {0}};
  18      DataValue result;
  19      RestartData *continuation;
  20      char *errMsg;
  21      int stat;
  22
  23 @@ -887,40 +886,35 @@ Boolean InSmartIndentMacros(WindowInfo *
  24  */
  25  static void executeModMacro(WindowInfo *window,smartIndentCBStruct *cbInfo)
  26  {
  27      windowSmartIndentData *winData =
  28             (windowSmartIndentData *)window->smartIndentData;
  29 -    /* args probably shouldn't be static due to future re-entrance issues <slobasso> */
  30 -    static DataValue args[2] = {{INT_TAG, {0}}, {STRING_TAG, {0}}};
  31 -    /* after 5.2 release remove inModCB and use new winData->inModMacro value */
  32 -    static int inModCB = False;
  33 +    DataValue args[2] = {{INT_TAG, {0}}, {STRING_TAG, {0}}};
  34      DataValue result;
  35      RestartData *continuation;
  36      char *errMsg;
  37      int stat;
  38
  39      /* Check for inappropriate calls and prevent re-entering if the macro
  40         makes a buffer modification */
  41 -    if (winData == NULL || winData->modMacro == NULL || inModCB)
  42 +    if (winData == NULL || winData->modMacro == NULL || winData->inModMacro)
  43         return;
  44
  45      /* Call modification macro with the position of the modification,
  46         and the character(s) inserted.  Don't allow
  47         preemption or time limit.  Execution must not overlap or re-enter */
  48      args[0].val.n = cbInfo->pos;
  49      AllocNStringCpy(&args[1].val.str, cbInfo->charsTyped);
  50
  51 -    inModCB = True;
  52      ++(winData->inModMacro);
  53
  54      stat = ExecuteMacro(window, winData->modMacro, 2, args, &result,
  55          &continuation, &errMsg);
  56      while (stat == MACRO_TIME_LIMIT)
  57          stat = ContinueMacro(continuation, &result, &errMsg);
  58
  59      --(winData->inModMacro);
  60 -    inModCB = False;
  61
  62      /* Process errors in macro execution */
  63      if (stat == MACRO_PREEMPT || stat == MACRO_ERROR)
  64      {
  65          DialogF(DF_ERR, window->shell, 1, "Smart Indent",