aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2011-02-09 21:03:29 -0800
committerGlenn Morris2011-02-09 21:03:29 -0800
commit67f02b82f496be403353a1dc918cc4f2278841bb (patch)
treee2a5deb64c1a7c41e5faa7f250b156a28b08b6d3
parent6ffb2c0ceba3960565f20ba695f64c3e2e2e5aae (diff)
downloademacs-67f02b82f496be403353a1dc918cc4f2278841bb.tar.gz
emacs-67f02b82f496be403353a1dc918cc4f2278841bb.zip
lwlib/ trivia.
* lwlib-Xaw.c, lwlib-Xlw.c, lwlib-Xm.c, lwlib-utils.c, lwlib.c, xlwmenu.c: Standardize on <> for includes from the ../src directory.
-rw-r--r--lwlib/ChangeLog7
-rw-r--r--lwlib/lwlib-Xaw.c4
-rw-r--r--lwlib/lwlib-Xlw.c8
-rw-r--r--lwlib/lwlib-Xm.c3
-rw-r--r--lwlib/lwlib-utils.c4
-rw-r--r--lwlib/lwlib.c4
-rw-r--r--lwlib/xlwmenu.c6
7 files changed, 20 insertions, 16 deletions
diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog
index b3c0b45bd68..d1cd1c04e00 100644
--- a/lwlib/ChangeLog
+++ b/lwlib/ChangeLog
@@ -1,9 +1,14 @@
12011-02-10 Glenn Morris <rgm@gnu.org>
2
3 * lwlib-Xaw.c, lwlib-Xlw.c, lwlib-Xm.c, lwlib-utils.c, lwlib.c:
4 * xlwmenu.c: Standardize on <> for includes from the ../src directory.
5
12011-02-09 Glenn Morris <rgm@gnu.org> 62011-02-09 Glenn Morris <rgm@gnu.org>
2 7
3 * Makefile.in (@SET_MAKE@): New, set by configure. 8 * Makefile.in (@SET_MAKE@): New, set by configure.
4 (globals): New variable and rule. 9 (globals): New variable and rule.
5 (lwlib-utils.o, lwlib.o, lwlib-Xlw.o, lwlib-Xaw.o, lwlib-Xm.o) 10 (lwlib-utils.o, lwlib.o, lwlib-Xlw.o, lwlib-Xaw.o, lwlib-Xm.o)
6 (xlwmenu.o): Add dependency on src/globals.h. 11 (xlwmenu.o): Add dependency on src/globals.h.
7 12
82011-01-31 Jan Djärv <jan.h.d@swipnet.se> 132011-01-31 Jan Djärv <jan.h.d@swipnet.se>
9 14
diff --git a/lwlib/lwlib-Xaw.c b/lwlib/lwlib-Xaw.c
index cf98a371968..19c2440989d 100644
--- a/lwlib/lwlib-Xaw.c
+++ b/lwlib/lwlib-Xaw.c
@@ -1,4 +1,5 @@
1/* The lwlib interface to Athena widgets. 1/* The lwlib interface to Athena widgets.
2
2Copyright (C) 1993 Chuck Thompson <cthomp@cs.uiuc.edu> 3Copyright (C) 1993 Chuck Thompson <cthomp@cs.uiuc.edu>
3Copyright (C) 1994, 2001-2011 Free Software Foundation, Inc. 4Copyright (C) 1994, 2001-2011 Free Software Foundation, Inc.
4 5
@@ -27,7 +28,7 @@ Boston, MA 02110-1301, USA. */
27#include <setjmp.h> 28#include <setjmp.h>
28#include <ctype.h> 29#include <ctype.h>
29 30
30#include "../src/lisp.h" 31#include <lisp.h>
31 32
32#include "lwlib-Xaw.h" 33#include "lwlib-Xaw.h"
33 34
@@ -833,4 +834,3 @@ xaw_creation_table [] =
833 {"main", xaw_create_main}, 834 {"main", xaw_create_main},
834 {NULL, NULL} 835 {NULL, NULL}
835}; 836};
836
diff --git a/lwlib/lwlib-Xlw.c b/lwlib/lwlib-Xlw.c
index 537011738fd..fe33eec29bf 100644
--- a/lwlib/lwlib-Xlw.c
+++ b/lwlib/lwlib-Xlw.c
@@ -1,6 +1,7 @@
1/* The lwlib interface to "xlwmenu" menus. 1/* The lwlib interface to "xlwmenu" menus.
2 Copyright (C) 1992 Lucid, Inc. 2
3 Copyright (C) 1994, 2000-2011 Free Software Foundation, Inc. 3Copyright (C) 1992 Lucid, Inc.
4Copyright (C) 1994, 2000-2011 Free Software Foundation, Inc.
4 5
5This file is part of the Lucid Widget Library. 6This file is part of the Lucid Widget Library.
6 7
@@ -24,7 +25,7 @@ Boston, MA 02110-1301, USA. */
24#endif 25#endif
25 26
26#include <setjmp.h> 27#include <setjmp.h>
27#include "lisp.h" 28#include <lisp.h>
28 29
29#include "lwlib-Xlw.h" 30#include "lwlib-Xlw.h"
30#include <X11/StringDefs.h> 31#include <X11/StringDefs.h>
@@ -272,4 +273,3 @@ xlw_destroy_instance (widget_instance *instance)
272 if (instance->widget) 273 if (instance->widget)
273 XtDestroyWidget (instance->widget); 274 XtDestroyWidget (instance->widget);
274} 275}
275
diff --git a/lwlib/lwlib-Xm.c b/lwlib/lwlib-Xm.c
index 059cf10d2bb..55b27b9dab0 100644
--- a/lwlib/lwlib-Xm.c
+++ b/lwlib/lwlib-Xm.c
@@ -34,7 +34,7 @@ Boston, MA 02110-1301, USA. */
34#include <X11/CoreP.h> 34#include <X11/CoreP.h>
35#include <X11/CompositeP.h> 35#include <X11/CompositeP.h>
36 36
37#include "../src/lisp.h" 37#include <lisp.h>
38 38
39#include "lwlib-Xm.h" 39#include "lwlib-Xm.h"
40#include "lwlib-utils.h" 40#include "lwlib-utils.h"
@@ -1956,4 +1956,3 @@ xm_manage_resizing (Widget w, Boolean flag)
1956{ 1956{
1957 XtVaSetValues (w, XtNallowShellResize, flag, NULL); 1957 XtVaSetValues (w, XtNallowShellResize, flag, NULL);
1958} 1958}
1959
diff --git a/lwlib/lwlib-utils.c b/lwlib/lwlib-utils.c
index 30f4f94f376..7c9a56d2aeb 100644
--- a/lwlib/lwlib-utils.c
+++ b/lwlib/lwlib-utils.c
@@ -1,4 +1,5 @@
1/* Defines some widget utility functions. 1/* Defines some widget utility functions.
2
2Copyright (C) 1992 Lucid, Inc. 3Copyright (C) 1992 Lucid, Inc.
3Copyright (C) 1994, 2001-2011 Free Software Foundation, Inc. 4Copyright (C) 1994, 2001-2011 Free Software Foundation, Inc.
4 5
@@ -31,7 +32,7 @@ Boston, MA 02110-1301, USA. */
31#undef rindex 32#undef rindex
32 33
33#include <setjmp.h> 34#include <setjmp.h>
34#include "../src/lisp.h" 35#include <lisp.h>
35 36
36#include <X11/Xatom.h> 37#include <X11/Xatom.h>
37#include <X11/IntrinsicP.h> 38#include <X11/IntrinsicP.h>
@@ -173,4 +174,3 @@ XtSafelyDestroyWidget (Widget widget)
173 abort (); 174 abort ();
174#endif 175#endif
175} 176}
176
diff --git a/lwlib/lwlib.c b/lwlib/lwlib.c
index e03196d7927..290ce091301 100644
--- a/lwlib/lwlib.c
+++ b/lwlib/lwlib.c
@@ -1,4 +1,5 @@
1/* A general interface to the widgets of different toolkits. 1/* A general interface to the widgets of different toolkits.
2
2Copyright (C) 1992, 1993 Lucid, Inc. 3Copyright (C) 1992, 1993 Lucid, Inc.
3Copyright (C) 1994-1996, 1999-2011 Free Software Foundation, Inc. 4Copyright (C) 1994-1996, 1999-2011 Free Software Foundation, Inc.
4 5
@@ -24,7 +25,7 @@ Boston, MA 02110-1301, USA. */
24#endif 25#endif
25 26
26#include <setjmp.h> 27#include <setjmp.h>
27#include "../src/lisp.h" 28#include <lisp.h>
28 29
29#include <sys/types.h> 30#include <sys/types.h>
30#include <stdio.h> 31#include <stdio.h>
@@ -1418,4 +1419,3 @@ lw_separator_p (const char *label, enum menu_separator *type, int motif_p)
1418 1419
1419 return separator_p; 1420 return separator_p;
1420} 1421}
1421
diff --git a/lwlib/xlwmenu.c b/lwlib/xlwmenu.c
index a53275c8e87..065d81e1fde 100644
--- a/lwlib/xlwmenu.c
+++ b/lwlib/xlwmenu.c
@@ -1,4 +1,5 @@
1/* Implements a lightweight menubar widget. 1/* Implements a lightweight menubar widget.
2
2Copyright (C) 1992 Lucid, Inc. 3Copyright (C) 1992 Lucid, Inc.
3Copyright (C) 1994-1995, 1997, 1999-2011 Free Software Foundation, Inc. 4Copyright (C) 1994-1995, 1997, 1999-2011 Free Software Foundation, Inc.
4 5
@@ -26,7 +27,7 @@ Boston, MA 02110-1301, USA. */
26#endif 27#endif
27 28
28#include <setjmp.h> 29#include <setjmp.h>
29#include "lisp.h" 30#include <lisp.h>
30 31
31#include <stdio.h> 32#include <stdio.h>
32#include <ctype.h> 33#include <ctype.h>
@@ -56,7 +57,7 @@ extern int gray_bitmap_width;
56extern int gray_bitmap_height; 57extern int gray_bitmap_height;
57extern char *gray_bitmap_bits; 58extern char *gray_bitmap_bits;
58 59
59#include "xterm.h" 60#include <xterm.h>
60 61
61#else /* not emacs */ 62#else /* not emacs */
62 63
@@ -2689,4 +2690,3 @@ pop_up_menu (XlwMenuWidget mw, XButtonPressedEvent *event)
2689 ((XMotionEvent*)event)->is_hint = 0; 2690 ((XMotionEvent*)event)->is_hint = 0;
2690 handle_motion_event (mw, (XMotionEvent*)event); 2691 handle_motion_event (mw, (XMotionEvent*)event);
2691} 2692}
2692