[Emacs-diffs] trunk r117302: * frame.h (window_system_available) [!HAVE_WINDOW_SYSTEM]: Always false.

[Dmitry Antipov]

------------------------------------------------------------
revno: 117302
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Tue 2014-06-10 09:28:00 +0400
message:
  * frame.h (window_system_available) [!HAVE_WINDOW_SYSTEM]: Always false.
  * frame.c (window_system_available) [HAVE_WINDOW_SYSTEM]: Now here.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/frame.c                    frame.c-20091113204419-o5vbwnq5f7feedwu-243
  src/frame.h                    frame.h-20091113204419-o5vbwnq5f7feedwu-229

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-06-10 04:55:03 +0000
+++ b/src/ChangeLog     2014-06-10 05:28:00 +0000
@@ -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  <address@hidden>
 
        Say (accept-process-output P)'s result pertains to P if P is non-nil.

=== modified file 'src/frame.c'
--- a/src/frame.c       2014-06-10 04:55:03 +0000
+++ b/src/frame.c       2014-06-10 05:28:00 +0000
@@ -162,19 +162,16 @@
   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)
 {

=== modified file 'src/frame.h'
--- a/src/frame.h       2014-06-10 04:55:03 +0000
+++ b/src/frame.h       2014-06-10 05:28:00 +0000
@@ -997,8 +997,10 @@
 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 *);