diff options
| author | Jan D <jan.h.d@swipnet.se> | 2015-04-26 13:55:01 +0200 |
|---|---|---|
| committer | Jan D <jan.h.d@swipnet.se> | 2015-04-26 13:55:01 +0200 |
| commit | f92ac2e82ed199d6f25d2a59508e08addb1150ac (patch) | |
| tree | d7d7756e3dbce10d8f73c27815d815499f78c2bd /lwlib | |
| parent | 5a094119ce79723108abd90a1fcc33721e964823 (diff) | |
| parent | a40869789fc5502e3d4e393b7c31d78cb7f29aa1 (diff) | |
| download | emacs-f92ac2e82ed199d6f25d2a59508e08addb1150ac.tar.gz | |
Merge branch 'master' into cairo
Diffstat (limited to 'lwlib')
| -rw-r--r-- | lwlib/ChangeLog.1 (renamed from lwlib/ChangeLog) | 0 | ||||
| -rw-r--r-- | lwlib/README | 2 | ||||
| -rw-r--r-- | lwlib/xlwmenu.c | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog.1 index 2e317dd2f66..2e317dd2f66 100644 --- a/lwlib/ChangeLog +++ b/lwlib/ChangeLog.1 diff --git a/lwlib/README b/lwlib/README index 25c72eba83f..ed7583d8fe1 100644 --- a/lwlib/README +++ b/lwlib/README @@ -4,4 +4,4 @@ library was written by Lucid, Inc and released under the terms of the GPL version 1 (or later). It is not considered part of GNU Emacs. This version of the library differs from the original as described in -the ChangeLog file. +the ChangeLog.1 file. diff --git a/lwlib/xlwmenu.c b/lwlib/xlwmenu.c index 9317dea02b0..61f175b3c25 100644 --- a/lwlib/xlwmenu.c +++ b/lwlib/xlwmenu.c @@ -105,7 +105,7 @@ xlwMenuTranslations [] = /* FIXME: F10 should enter the menu, the first one in the menu-bar. */ -#define offset(field) XtOffset(XlwMenuWidget, field) +#define offset(field) offsetof (XlwMenuRec, field) static XtResource xlwMenuResources[] = { |