procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* frame.h (window_system_available) [!HAVE_WINDOW_SYSTEM]: Always false.

Browse source 
* frame.c (window_system_available) [HAVE_WINDOW_SYSTEM]: Now here.
This commit is contained in:
Dmitry Antipov 2014-06-10 09:28:00 +04:00
parent bfd559357d
commit bd009aefd5
3 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/ChangeLog
View file

@ -22,6 +22,9 @@
* w32term.c (w32_read_socket, w32_initialize):
* xterm.c (handle_one_xevent, x_initialize): Adjust users.
* frame.h (window_system_available) [!HAVE_WINDOW_SYSTEM]: Always false.
* frame.c (window_system_available) [HAVE_WINDOW_SYSTEM]: Now here.
2014-06-09 Paul Eggert <eggert@cs.ucla.edu>
Say (accept-process-output P)'s result pertains to P if P is non-nil.

13
src/frame.c
View file

@ -162,19 +162,16 @@ decode_any_frame (register Lisp_Object frame)
return XFRAME (frame);
}
#ifdef HAVE_WINDOW_SYSTEM
bool
window_system_available (struct frame *f)
{
if (f)
return FRAME_WINDOW_P (f) || FRAME_MSDOS_P (f);
else
#ifdef HAVE_WINDOW_SYSTEM
return x_display_list != NULL;
#else
return 0;
#endif
return f ? FRAME_WINDOW_P (f) || FRAME_MSDOS_P (f) : x_display_list != NULL;
}
#endif /* HAVE_WINDOW_SYSTEM */
struct frame *
decode_window_system_frame (Lisp_Object frame)
{

4
src/frame.h
View file

@ -997,8 +997,10 @@ extern struct frame *make_minibuffer_frame (void);
extern struct frame *make_frame_without_minibuffer (Lisp_Object,
struct kboard *,
Lisp_Object);
#endif /* HAVE_WINDOW_SYSTEM */
extern bool window_system_available (struct frame *);
#else /* not HAVE_WINDOW_SYSTEM */
#define window_system_available(f) ((void) (f), false)
#endif /* HAVE_WINDOW_SYSTEM */
extern void check_window_system (struct frame *);
extern void frame_make_pointer_invisible (struct frame *);
extern void frame_make_pointer_visible (struct frame *);