From 01f67d2c303dcd8fd85a7f4359561a4d61249f7a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Pavel=20Jan=C3=ADk?= Date: Mon, 8 Oct 2001 06:37:59 +0000 Subject: [PATCH] USE_LUCID can be defined iff USE_X_TOOLKIT is defined. (xm_scroll_callback) [USE_MOTIF]: Remove unused variable `percent'. (x_set_toolkit_scroll_bar_thumb) [USE_MOTIF]: Remove unused variable `sb'. --- src/ChangeLog | 10 ++++++++++ src/emacs.c | 2 +- src/xterm.c | 12 +++++------- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index b9cfcabde29..493a7f61d42 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,15 @@ 2001-10-08 Pavel Jan,Bm(Bk + * lisp.h (init_window): Add prototype. + + * editfns.c: Include ctype.h. + + * xterm.c: USE_LUCID can be defined iff USE_X_TOOLKIT is defined. + (xm_scroll_callback) [USE_MOTIF]: Remove unused variable + `percent'. + (x_set_toolkit_scroll_bar_thumb) [USE_MOTIF]: Remove unused + variable `sb'. + * xfns.c (Fx_hide_tip): Fix typo in a doc string. (Fx_file_dialog) [USE_MOTIF]: Remove unused variables `popup_activated_flag' and `title'. diff --git a/src/emacs.c b/src/emacs.c index 7ac6c31be01..ab9521cc4c7 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -1159,7 +1159,7 @@ main (argc, argv, envp) init_eval (); init_data (); #ifdef CLASH_DETECTION - init_filelock ();; + init_filelock (); #endif init_atimer (); running_asynch_code = 0; diff --git a/src/xterm.c b/src/xterm.c index b48b5187062..702a1fd4c3a 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -8252,7 +8252,7 @@ x_window_to_scroll_bar (window_id) } -#if defined USE_X_TOOLKIT && defined USE_LUCID +#if defined USE_LUCID /* Return the Lucid menu bar WINDOW is part of. Return null if WINDOW is not part of a menu bar. */ @@ -8277,7 +8277,7 @@ x_window_to_menu_bar (window) return NULL; } -#endif /* USE_X_TOOLKIT && USE_LUCID */ +#endif /* USE_LUCID */ /************************************************************************ @@ -8484,7 +8484,6 @@ xm_scroll_callback (widget, client_data, call_data) { struct scroll_bar *bar = (struct scroll_bar *) client_data; XmScrollBarCallbackStruct *cs = (XmScrollBarCallbackStruct *) call_data; - double percent; int part = -1, whole = 0, portion = 0; switch (cs->reason) @@ -8870,7 +8869,6 @@ x_set_toolkit_scroll_bar_thumb (bar, portion, position, whole) #ifdef USE_MOTIF { int size, value; - XmScrollBarWidget sb; /* Slider size. Must be in the range [1 .. MAX - MIN] where MAX is the scroll bar's maximum and MIN is the scroll bar's minimum @@ -10293,7 +10291,7 @@ XTread_socket (sd, bufp, numchars, expected) #ifndef USE_TOOLKIT_SCROLL_BARS struct scroll_bar *bar; #endif -#if defined USE_X_TOOLKIT && defined USE_LUCID +#if defined USE_LUCID /* Submenus of the Lucid menu bar aren't widgets themselves, so there's no way to dispatch events to them. Recognize this case separately. */ @@ -10303,8 +10301,8 @@ XTread_socket (sd, bufp, numchars, expected) if (widget) xlwmenu_redisplay (widget); } -#endif /* USE_X_TOOLKIT && USE_LUCID */ - +#endif /* USE_LUCID */ + #ifdef USE_TOOLKIT_SCROLL_BARS /* Dispatch event to the widget. */ goto OTHER; -- 2.39.2