[Emacs-diffs] Changes to emacs/lwlib/lwlib.c

[Richard M. Stallman]

Index: emacs/lwlib/lwlib.c
diff -c emacs/lwlib/lwlib.c:1.43 emacs/lwlib/lwlib.c:1.44
*** emacs/lwlib/lwlib.c:1.43    Sat Sep 30 13:03:27 2000
--- emacs/lwlib/lwlib.c Sat Dec  1 23:52:12 2001
***************
*** 26,31 ****
--- 26,33 ----
  #include <config.h>
  #endif
  
+ #include "../src/lisp.h"
+ 
  #include <sys/types.h>
  #include <stdio.h>
  #include <ctype.h>
***************
*** 33,40 ****
  #include "lwlib-utils.h"
  #include <X11/StringDefs.h>
  
- extern long *xmalloc();
- 
  #if defined (USE_LUCID)
  #include "lwlib-Xlw.h"
  #endif
--- 35,40 ----
***************
*** 237,245 ****
    if (wv->name) free (wv->name);
    if (wv->value) free (wv->value);
    if (wv->key) free (wv->key);
-   if (wv->help) free (wv->help);
  
!   wv->name = wv->value = wv->key = wv->help = (char *) 0xDEADBEEF;
  
    if (wv->toolkit_data && wv->free_toolkit_data)
      {
--- 237,244 ----
    if (wv->name) free (wv->name);
    if (wv->value) free (wv->value);
    if (wv->key) free (wv->key);
  
!   wv->name = wv->value = wv->key = (char *) 0xDEADBEEF;
  
    if (wv->toolkit_data && wv->free_toolkit_data)
      {
***************
*** 276,282 ****
    copy->name = safe_strdup (val->name);
    copy->value = safe_strdup (val->value);
    copy->key = safe_strdup (val->key);
!   copy->help = safe_strdup (val->help);
    copy->enabled = val->enabled;
    copy->button_type = val->button_type;
    copy->selected = val->selected;
--- 275,281 ----
    copy->name = safe_strdup (val->name);
    copy->value = safe_strdup (val->value);
    copy->key = safe_strdup (val->key);
!   copy->help = val->help;
    copy->enabled = val->enabled;
    copy->button_type = val->button_type;
    copy->selected = val->selected;
***************
*** 546,558 ****
        safe_free_str (val1->key);
        val1->key = safe_strdup (val2->key);
      }
!   if (safe_strcmp (val1->help, val2->help))
      {
        EXPLAIN (val1->name, change, VISIBLE_CHANGE, "help change",
               val1->help, val2->help);
        change = max (change, VISIBLE_CHANGE);
!       safe_free_str (val1->help);
!       val1->help = safe_strdup (val2->help);
      }
    if (val1->enabled != val2->enabled)
      {
--- 545,556 ----
        safe_free_str (val1->key);
        val1->key = safe_strdup (val2->key);
      }
!   if (! EQ (val1->help, val2->help))
      {
        EXPLAIN (val1->name, change, VISIBLE_CHANGE, "help change",
               val1->help, val2->help);
        change = max (change, VISIBLE_CHANGE);
!       val1->help = val2->help;
      }
    if (val1->enabled != val2->enabled)
      {