aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRichard M. Stallman1995-11-11 07:13:06 +0000
committerRichard M. Stallman1995-11-11 07:13:06 +0000
commit0fdff6bbc25853de0b683ca3234435091a056682 (patch)
tree06413397403b0250e7521e763f18912239f9a5cb /src
parenta4e4b9160175e7d030bc6918ab083de38a7650fb (diff)
downloademacs-0fdff6bbc25853de0b683ca3234435091a056682.tar.gz
emacs-0fdff6bbc25853de0b683ca3234435091a056682.zip
(HACK_EDITRES): Define here as in xfns.c.
(XTread_socket): Test HACK_EDITRES.
Diffstat (limited to 'src')
-rw-r--r--src/xterm.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/xterm.c b/src/xterm.c
index 8a16fcbae72..eb79e883d02 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -85,8 +85,11 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
85 85
86#ifdef USE_X_TOOLKIT 86#ifdef USE_X_TOOLKIT
87extern void free_frame_menubar (); 87extern void free_frame_menubar ();
88extern void _XEditResCheckMessages ();
89extern FRAME_PTR x_menubar_window_to_frame (); 88extern FRAME_PTR x_menubar_window_to_frame ();
89#if (XtSpecificationRelease >= 5) && !defined(NO_EDITRES)
90#define HACK_EDITRES
91extern void _XEditResCheckMessages ();
92#endif /* not NO_EDITRES */
90#endif /* USE_X_TOOLKIT */ 93#endif /* USE_X_TOOLKIT */
91 94
92#ifndef USE_X_TOOLKIT 95#ifndef USE_X_TOOLKIT
@@ -3420,7 +3423,7 @@ XTread_socket (sd, bufp, numchars, waitp, expected)
3420 f->output_data.x->top_pos = new_y; 3423 f->output_data.x->top_pos = new_y;
3421 } 3424 }
3422 } 3425 }
3423#if defined (USE_X_TOOLKIT) && defined (HAVE_X11R5) 3426#ifdef HACK_EDITRES
3424 else if (event.xclient.message_type 3427 else if (event.xclient.message_type
3425 == dpyinfo->Xatom_editres) 3428 == dpyinfo->Xatom_editres)
3426 { 3429 {
@@ -3429,7 +3432,7 @@ XTread_socket (sd, bufp, numchars, waitp, expected)
3429 _XEditResCheckMessages (f->output_data.x->widget, NULL, 3432 _XEditResCheckMessages (f->output_data.x->widget, NULL,
3430 &event, NULL); 3433 &event, NULL);
3431 } 3434 }
3432#endif /* USE_X_TOOLKIT and HAVE_X11R5 */ 3435#endif /* HACK_EDITRES */
3433 } 3436 }
3434 break; 3437 break;
3435 3438