diff options
| author | Richard M. Stallman | 1996-08-10 18:51:19 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1996-08-10 18:51:19 +0000 |
| commit | 61069f2b083f256087244ec8a15c5660c7d75d70 (patch) | |
| tree | 26328f33126a8b736b682fd3f2670ad2507a8c0a | |
| parent | 565157eefa62ad416c7aa841953fa2aee1be5345 (diff) | |
| download | emacs-61069f2b083f256087244ec8a15c5660c7d75d70.tar.gz emacs-61069f2b083f256087244ec8a15c5660c7d75d70.zip | |
(merge_widget_value): Undo previous change.
| -rw-r--r-- | lwlib/lwlib.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lwlib/lwlib.c b/lwlib/lwlib.c index f24dd778ca5..981c92e5686 100644 --- a/lwlib/lwlib.c +++ b/lwlib/lwlib.c | |||
| @@ -526,9 +526,11 @@ merge_widget_value (val1, val2, level) | |||
| 526 | EXPLAIN (val1->name, change, INVISIBLE_CHANGE, "(contents change)", | 526 | EXPLAIN (val1->name, change, INVISIBLE_CHANGE, "(contents change)", |
| 527 | 0, 0); | 527 | 0, 0); |
| 528 | change = max (change, INVISIBLE_CHANGE); | 528 | change = max (change, INVISIBLE_CHANGE); |
| 529 | #if 0 /* This was replaced by the August 9 1996 change in lwlib-Xm.c. */ | ||
| 529 | #ifdef USE_MOTIF | 530 | #ifdef USE_MOTIF |
| 530 | change = max (merged_contents->change, change); | 531 | change = max (merged_contents->change, change); |
| 531 | #endif | 532 | #endif |
| 533 | #endif | ||
| 532 | } | 534 | } |
| 533 | 535 | ||
| 534 | val1->contents = merged_contents; | 536 | val1->contents = merged_contents; |