Mercurial > emacs
comparison lwlib/lwlib.c @ 15854:184808f2a73c
(merge_widget_value): Undo previous change.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Sat, 10 Aug 1996 18:51:19 +0000 |
| parents | fb5e87397205 |
| children | fb4644a9f761 |
comparison
equal
deleted
inserted
replaced
| 15853:1ca5c3c9853a | 15854:184808f2a73c |
|---|---|
| 524 else if (merged_contents && merged_contents->change != NO_CHANGE) | 524 else if (merged_contents && merged_contents->change != NO_CHANGE) |
| 525 { | 525 { |
| 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); |
| 532 #endif | |
| 531 #endif | 533 #endif |
| 532 } | 534 } |
| 533 | 535 |
| 534 val1->contents = merged_contents; | 536 val1->contents = merged_contents; |
| 535 } | 537 } |