emacs/emacs-21.3-nonvoid.patch

70 lines
1.4 KiB
Diff

--- lwlib/lwlib-Xaw.c
+++ lwlib/lwlib-Xaw.c
@@ -601,11 +601,11 @@
xaw_create_scrollbar (instance)
widget_instance *instance;
{
+ Widget scrollbar = (Widget)0;
#if 0
Arg av[20];
int ac = 0;
Dimension width;
- Widget scrollbar;
XtVaGetValues (instance->parent, XtNwidth, &width, NULL);
@@ -632,8 +632,8 @@
XtAddCallback (scrollbar, "scrollProc", xaw_scrollbar_scroll,
(XtPointer) instance);
- return scrollbar;
#endif
+ return scrollbar;
}
static Widget
--- src/keyboard.c
+++ src/keyboard.c
@@ -1317,6 +1317,7 @@
Lisp_Object arg;
{
cancel_hourglass ();
+ return Qnil;
}
#endif
--- src/syntax.c
+++ src/syntax.c
@@ -2409,6 +2409,7 @@
Fcons (make_number (from), Qnil))));
/* NOTREACHED */
+ return Qnil;
}
DEFUN ("scan-lists", Fscan_lists, Sscan_lists, 3, 3, 0,
--- src/xmenu.c
+++ src/xmenu.c
@@ -695,8 +695,8 @@
Lisp_Object keymap, tem;
int xpos = 0, ypos = 0;
Lisp_Object title;
- char *error_name;
- Lisp_Object selection;
+ char *error_name = (char*)0;
+ Lisp_Object selection = (Lisp_Object)0;
struct frame *f = NULL;
Lisp_Object x, y, window;
int keymaps = 0;
@@ -972,8 +972,8 @@
#else
{
Lisp_Object title;
- char *error_name;
- Lisp_Object selection;
+ char *error_name = (char*)0;
+ Lisp_Object selection = (Lisp_Object)0;
/* Decode the dialog items from what was specified. */
title = Fcar (contents);