[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r112228: Consistently use platform-sp
|
From: |
Dmitry Antipov |
|
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r112228: Consistently use platform-specific function to detect window system. |
|
Date: |
Fri, 05 Apr 2013 18:07:02 +0400 |
|
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 112228
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Fri 2013-04-05 18:07:02 +0400
message:
Consistently use platform-specific function to detect window system.
* lisp.h (check_window_system): New prototype. This function is
going to replace check_x, check_w32 and check_ns.
(have_menus_p): Mention msdos.c in comment.
* fontset.c (check_window_system_func): Remove. Adjust all users.
* fontset.h (check_window_system_func): Remove prototype.
* nsterm.h (check_ns):
* xterm.h (check_x):
* w32term.h (check_w32): Likewise.
* menu.c (Fx_popup_menu): Use check_window_system.
* msdos.c (check_window_system): Define for MS-DOS.
* nsfns.m (check_window_system): Define for NS. Adjust all users.
* w32fns.c (check_window_system): Likewise for MS-Windows.
* xfns.c (check_window_system): Likewise for X.
* font.c, frame.c, nsmenu.m, nsselect.m, nsterm.m, w32menu.c:
* xfaces.c, xmenu.c: Use check_window_system where appropriate.
modified:
src/ChangeLog
src/font.c
src/fontset.c
src/fontset.h
src/frame.c
src/lisp.h
src/menu.c
src/msdos.c
src/nsfns.m
src/nsmenu.m
src/nsselect.m
src/nsterm.h
src/nsterm.m
src/w32fns.c
src/w32menu.c
src/w32term.h
src/xfaces.c
src/xfns.c
src/xmenu.c
src/xterm.h
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2013-04-02 01:54:56 +0000
+++ b/src/ChangeLog 2013-04-05 14:07:02 +0000
@@ -1,3 +1,22 @@
+2013-04-05 Dmitry Antipov <address@hidden>
+
+ Consistently use platform-specific function to detect window system.
+ * lisp.h (check_window_system): New prototype. This function is
+ going to replace check_x, check_w32 and check_ns.
+ (have_menus_p): Mention msdos.c in comment.
+ * fontset.c (check_window_system_func): Remove. Adjust all users.
+ * fontset.h (check_window_system_func): Remove prototype.
+ * nsterm.h (check_ns):
+ * xterm.h (check_x):
+ * w32term.h (check_w32): Likewise.
+ * menu.c (Fx_popup_menu): Use check_window_system.
+ * msdos.c (check_window_system): Define for MS-DOS.
+ * nsfns.m (check_window_system): Define for NS. Adjust all users.
+ * w32fns.c (check_window_system): Likewise for MS-Windows.
+ * xfns.c (check_window_system): Likewise for X.
+ * font.c, frame.c, nsmenu.m, nsselect.m, nsterm.m, w32menu.c:
+ * xfaces.c, xmenu.c: Use check_window_system where appropriate.
+
2013-04-02 Paul Eggert <address@hidden>
Prefer < to > in range checks such as 0 <= i && i < N.
=== modified file 'src/font.c'
--- a/src/font.c 2013-04-02 01:54:56 +0000
+++ b/src/font.c 2013-04-05 14:07:02 +0000
@@ -4844,7 +4844,7 @@
Lisp_Object info;
Lisp_Object font_object;
- (*check_window_system_func) ();
+ check_window_system ();
if (! FONTP (name))
CHECK_STRING (name);
=== modified file 'src/fontset.c'
--- a/src/fontset.c 2013-02-08 05:28:52 +0000
+++ b/src/fontset.c 2013-04-05 14:07:02 +0000
@@ -179,10 +179,6 @@
font for each character. */
static Lisp_Object Vdefault_fontset;
-/* Check if any window system is used now. */
-void (*check_window_system_func) (void);
-
-
/* Prototype declarations for static functions. */
static Lisp_Object make_fontset (Lisp_Object, Lisp_Object, Lisp_Object);
@@ -1213,7 +1209,7 @@
Lisp_Object fontset;
int id;
- (*check_window_system_func) ();
+ check_window_system ();
CHECK_STRING (pattern);
@@ -1919,7 +1915,7 @@
Lisp_Object val, elt;
int c, i, j, k;
- (*check_window_system_func) ();
+ check_window_system ();
fontset = check_fontset_name (fontset, &frame);
=== modified file 'src/fontset.h'
--- a/src/fontset.h 2013-01-01 09:11:05 +0000
+++ b/src/fontset.h 2013-04-05 14:07:02 +0000
@@ -26,9 +26,6 @@
#ifndef EMACS_FONTSET_H
#define EMACS_FONTSET_H
-/* Check if any window system is used now. */
-extern void (*check_window_system_func) (void);
-
struct face;
extern void free_face_fontset (FRAME_PTR, struct face *);
=== modified file 'src/frame.c'
--- a/src/frame.c 2013-04-02 01:54:56 +0000
+++ b/src/frame.c 2013-04-05 14:07:02 +0000
@@ -3493,9 +3493,7 @@
(Lisp_Object attribute, Lisp_Object class, Lisp_Object component,
Lisp_Object subclass)
{
-#ifdef HAVE_X_WINDOWS
- check_x ();
-#endif
+ check_window_system ();
return xrdb_get_resource (check_x_display_info (Qnil)->xrdb,
attribute, class, component, subclass);
=== modified file 'src/lisp.h'
--- a/src/lisp.h 2013-04-02 01:54:56 +0000
+++ b/src/lisp.h 2013-04-05 14:07:02 +0000
@@ -3765,6 +3765,11 @@
extern char *x_get_keysym_name (int);
#endif /* HAVE_WINDOW_SYSTEM */
+#if defined(HAVE_WINDOW_SYSTEM) || defined (MSDOS)
+/* Defined in (x|w32)fns.c, nsfns.m, msdos.c. */
+extern void check_window_system (void);
+#endif
+
#ifdef HAVE_LIBXML2
/* Defined in xml.c. */
extern void syms_of_xml (void);
@@ -3772,7 +3777,7 @@
#endif
#ifdef HAVE_MENUS
-/* Defined in (x|w32)fns.c, nsfns.m... */
+/* Defined in (x|w32)fns.c, nsfns.m, msdos.c. */
extern int have_menus_p (void);
#endif
=== modified file 'src/menu.c'
--- a/src/menu.c 2013-03-24 12:59:45 +0000
+++ b/src/menu.c 2013-04-05 14:07:02 +0000
@@ -1085,7 +1085,8 @@
#ifdef HAVE_MENUS
{
bool get_current_pos_p = 0;
- /* FIXME!! check_w32 (); or check_x (); or check_ns (); */
+
+ check_window_system ();
/* Decode the first argument: find the window and the coordinates. */
if (EQ (position, Qt)
=== modified file 'src/msdos.c'
--- a/src/msdos.c 2013-03-28 14:04:49 +0000
+++ b/src/msdos.c 2013-04-05 14:07:02 +0000
@@ -1920,7 +1920,7 @@
/* We are not X, but we can emulate it well enough for our needs... */
void
-check_x (void)
+check_window_system (void)
{
if (! FRAME_MSDOS_P (SELECTED_FRAME ()))
error ("Not running under a window system");
=== modified file 'src/nsfns.m'
--- a/src/nsfns.m 2013-03-28 14:04:49 +0000
+++ b/src/nsfns.m 2013-04-05 14:07:02 +0000
@@ -109,7 +109,7 @@
void
-check_ns (void)
+check_window_system (void)
{
if (NSApp == nil)
error ("OpenStep is not in use or not initialized");
@@ -1145,7 +1145,7 @@
Lisp_Object tfont, tfontsize;
static int desc_ctr = 1;
- check_ns ();
+ check_window_system ();
/* x_get_arg modifies parms. */
parms = Fcopy_alist (parms);
@@ -1442,7 +1442,7 @@
id fm;
struct frame *f;
- check_ns ();
+ check_window_system ();
fm = [NSFontManager sharedFontManager];
if (NILP (frame))
f = SELECTED_FRAME ();
@@ -1466,7 +1466,7 @@
{
struct frame *f;
- check_ns ();
+ check_window_system ();
if (NILP (frame))
f = SELECTED_FRAME ();
else
@@ -1503,7 +1503,7 @@
NSString *initS = NILP (init) || !STRINGP (init) ? nil :
[NSString stringWithUTF8String: SSDATA (init)];
- check_ns ();
+ check_window_system ();
if (fileDelegate == nil)
fileDelegate = [EmacsFileDelegate new];
@@ -1594,7 +1594,7 @@
{
const char *value;
- check_ns ();
+ check_window_system ();
if (NILP (owner))
owner = build_string([ns_app_name UTF8String]);
CHECK_STRING (name);
@@ -1614,7 +1614,7 @@
If VALUE is nil, the default is removed. */)
(Lisp_Object owner, Lisp_Object name, Lisp_Object value)
{
- check_ns ();
+ check_window_system ();
if (NILP (owner))
owner = build_string ([ns_app_name UTF8String]);
CHECK_STRING (name);
@@ -1642,7 +1642,7 @@
doc: /* This function is a no-op. It is only present for completeness.
*/)
(Lisp_Object display)
{
- check_ns ();
+ check_window_system ();
/* This function has no real equivalent under NeXTstep. Return nil to
indicate this. */
return Qnil;
@@ -1692,7 +1692,7 @@
{
int num;
- check_ns ();
+ check_window_system ();
num = [[NSScreen screens] count];
return (num != 0) ? make_number (num) : Qnil;
@@ -1706,7 +1706,7 @@
If omitted or nil, the selected frame's display is used. */)
(Lisp_Object display)
{
- check_ns ();
+ check_window_system ();
return make_number ((int)
([ns_get_screen (display)
frame].size.height/(92.0/25.4)));
}
@@ -1719,7 +1719,7 @@
If omitted or nil, the selected frame's display is used. */)
(Lisp_Object display)
{
- check_ns ();
+ check_window_system ();
return make_number ((int)
([ns_get_screen (display) frame].size.width/(92.0/25.4)));
}
@@ -1733,7 +1733,7 @@
If omitted or nil, the selected frame's display is used. */)
(Lisp_Object display)
{
- check_ns ();
+ check_window_system ();
switch ([ns_get_window (display) backingType])
{
case NSBackingStoreBuffered:
@@ -1759,7 +1759,7 @@
(Lisp_Object display)
{
NSWindowDepth depth;
- check_ns ();
+ check_window_system ();
depth = [ns_get_screen (display) depth];
if ( depth == NSBestDepth (NSCalibratedWhiteColorSpace, 2, 2, YES, NULL))
@@ -1786,7 +1786,7 @@
If omitted or nil, the selected frame's display is used. */)
(Lisp_Object display)
{
- check_ns ();
+ check_window_system ();
switch ([ns_get_window (display) backingType])
{
case NSBackingStoreBuffered:
@@ -1839,7 +1839,7 @@
The argument DISPLAY is currently ignored. */)
(Lisp_Object display)
{
- check_ns ();
+ check_window_system ();
/*ns_delete_terminal (dpyinfo->terminal); */
[NSApp terminate: NSApp];
return Qnil;
@@ -1865,7 +1865,7 @@
doc: /* Hides all applications other than Emacs. */)
(void)
{
- check_ns ();
+ check_window_system ();
[NSApp hideOtherApplications: NSApp];
return Qnil;
}
@@ -1878,7 +1878,7 @@
the active application. */)
(Lisp_Object on)
{
- check_ns ();
+ check_window_system ();
if (EQ (on, intern ("activate")))
{
[NSApp unhide: NSApp];
@@ -1897,7 +1897,7 @@
doc: /* Shows the 'Info' or 'About' panel for Emacs. */)
(void)
{
- check_ns ();
+ check_window_system ();
[NSApp orderFrontStandardAboutPanel: nil];
return Qnil;
}
@@ -1975,7 +1975,7 @@
NSMenu *svcs;
id delegate;
- check_ns ();
+ check_window_system ();
svcs = [[NSMenu alloc] initWithTitle: @"Services"];
[NSApp setServicesMenu: svcs];
[NSApp registerServicesMenuSendTypes: ns_send_types
@@ -2028,7 +2028,7 @@
char *utfStr;
CHECK_STRING (service);
- check_ns ();
+ check_window_system ();
utfStr = SSDATA (service);
svcName = [NSString stringWithUTF8String: utfStr];
@@ -2152,7 +2152,7 @@
NSEvent *nxev;
CHECK_STRING (script);
- check_ns ();
+ check_window_system ();
block_input ();
@@ -2235,7 +2235,7 @@
/* remove appname prefix; TODO: allow for !="Emacs" */
char *toCheck = class + (!strncmp (class, "Emacs.", 6) ? 6 : 0);
const char *res;
- check_ns ();
+ check_window_system ();
if (inhibit_x_resources)
/* --quick was passed, so this is a no-op. */
@@ -2305,7 +2305,7 @@
(Lisp_Object color, Lisp_Object frame)
{
NSColor * col;
- check_ns ();
+ check_window_system ();
return ns_lisp_to_color (color, &col) ? Qnil : Qt;
}
@@ -2317,7 +2317,7 @@
NSColor * col;
CGFloat red, green, blue, alpha;
- check_ns ();
+ check_window_system ();
CHECK_STRING (color);
if (ns_lisp_to_color (color, &col))
@@ -2336,7 +2336,7 @@
{
NSWindowDepth depth;
NSString *colorSpace;
- check_ns ();
+ check_window_system ();
depth = [ns_get_screen (display) depth];
colorSpace = NSColorSpaceFromDepth (depth);
@@ -2356,7 +2356,7 @@
(Lisp_Object display)
{
NSWindowDepth depth;
- check_ns ();
+ check_window_system ();
depth = [ns_get_screen (display) depth];
return NSBitsPerPixelFromDepth (depth) > 1 ? Qt : Qnil;
@@ -2371,7 +2371,7 @@
If omitted or nil, that stands for the selected frame's display. */)
(Lisp_Object display)
{
- check_ns ();
+ check_window_system ();
return make_number ((int) [ns_get_screen (display) frame].size.width);
}
@@ -2384,7 +2384,7 @@
If omitted or nil, that stands for the selected frame's display. */)
(Lisp_Object display)
{
- check_ns ();
+ check_window_system ();
return make_number ((int) [ns_get_screen (display) frame].size.height);
}
@@ -2404,7 +2404,7 @@
NSScreen *screen;
NSRect vScreen;
- check_ns ();
+ check_window_system ();
screen = ns_get_screen (display);
if (!screen)
return Qnil;
@@ -2428,7 +2428,7 @@
If omitted or nil, that stands for the selected frame's display. */)
(Lisp_Object display)
{
- check_ns ();
+ check_window_system ();
return make_number
(NSBitsPerPixelFromDepth ([ns_get_screen (display) depth]));
}
@@ -2443,7 +2443,7 @@
(Lisp_Object display)
{
struct ns_display_info *dpyinfo;
- check_ns ();
+ check_window_system ();
dpyinfo = check_ns_display_info (display);
/* We force 24+ bit depths to 24-bit to prevent an overflow. */
@@ -2787,9 +2787,6 @@
defsubr (&Sx_show_tip);
defsubr (&Sx_hide_tip);
- /* used only in fontset.c */
- check_window_system_func = check_ns;
-
as_status = 0;
as_script = Qnil;
as_result = 0;
=== modified file 'src/nsmenu.m'
--- a/src/nsmenu.m 2013-04-01 07:58:04 +0000
+++ b/src/nsmenu.m 2013-04-05 14:07:02 +0000
@@ -1409,7 +1409,7 @@
NSTRACE (x-popup-dialog);
- check_ns ();
+ check_window_system ();
isQ = NILP (header);
=== modified file 'src/nsselect.m'
--- a/src/nsselect.m 2013-02-08 05:28:52 +0000
+++ b/src/nsselect.m 2013-04-05 14:07:02 +0000
@@ -355,7 +355,7 @@
Lisp_Object target_symbol, data;
- check_ns ();
+ check_window_system ();
CHECK_SYMBOL (selection);
if (NILP (value))
error ("selection value may not be nil.");
@@ -409,7 +409,7 @@
(Lisp_Object selection, Lisp_Object time_object, Lisp_Object terminal)
{
id pb;
- check_ns ();
+ check_window_system ();
CHECK_SYMBOL (selection);
if (NILP (assq_no_quit (selection, Vselection_alist))) return Qnil;
@@ -436,7 +436,7 @@
id pb;
NSArray *types;
- check_ns ();
+ check_window_system ();
CHECK_SYMBOL (selection);
if (EQ (selection, Qnil)) selection = QPRIMARY;
if (EQ (selection, Qt)) selection = QSECONDARY;
@@ -464,7 +464,7 @@
On Nextstep, TERMINAL is unused. */)
(Lisp_Object selection, Lisp_Object terminal)
{
- check_ns ();
+ check_window_system ();
CHECK_SYMBOL (selection);
if (EQ (selection, Qnil)) selection = QPRIMARY;
if (EQ (selection, Qt)) selection = QSECONDARY;
@@ -492,7 +492,7 @@
{
Lisp_Object val;
- check_ns ();
+ check_window_system ();
CHECK_SYMBOL (selection_name);
CHECK_SYMBOL (target_type);
val = ns_get_local_selection (selection_name, target_type);
@@ -516,7 +516,7 @@
(Lisp_Object selection)
{
id pb;
- check_ns ();
+ check_window_system ();
pb = ns_symbol_to_pb (selection);
return pb != nil ? ns_string_from_pasteboard (pb) : Qnil;
}
@@ -529,7 +529,7 @@
(Lisp_Object selection, Lisp_Object string)
{
id pb;
- check_ns ();
+ check_window_system ();
pb = ns_symbol_to_pb (selection);
if (pb != nil) ns_string_to_pasteboard (pb, string);
return Qnil;
=== modified file 'src/nsterm.h'
--- a/src/nsterm.h 2013-03-30 09:57:27 +0000
+++ b/src/nsterm.h 2013-04-05 14:07:02 +0000
@@ -764,7 +764,6 @@
extern const char *ns_xlfd_to_fontname (const char *xlfd);
-extern void check_ns (void);
extern Lisp_Object ns_map_event_to_object (void);
#ifdef __OBJC__
extern Lisp_Object ns_string_from_pasteboard (id pb);
=== modified file 'src/nsterm.m'
--- a/src/nsterm.m 2013-03-30 09:57:27 +0000
+++ b/src/nsterm.m 2013-04-05 14:07:02 +0000
@@ -1013,7 +1013,7 @@
--------------------------------------------------------------------------
*/
{
NSView *view = FRAME_NS_VIEW (f);
- check_ns ();
+ check_window_system ();
block_input ();
if (FRAME_VISIBLE_P (f))
[[view window] makeKeyAndOrderFront: NSApp];
@@ -1028,7 +1028,7 @@
--------------------------------------------------------------------------
*/
{
NSView *view = FRAME_NS_VIEW (f);
- check_ns ();
+ check_window_system ();
block_input ();
[[view window] orderBack: NSApp];
unblock_input ();
@@ -1133,7 +1133,7 @@
{
NSView * view = FRAME_NS_VIEW (f);
NSTRACE (x_make_frame_invisible);
- check_ns ();
+ check_window_system ();
[[view window] orderOut: NSApp];
SET_FRAME_VISIBLE (f, 0);
SET_FRAME_ICONIFIED (f, 0);
@@ -1149,7 +1149,7 @@
NSView * view = FRAME_NS_VIEW (f);
struct ns_display_info *dpyinfo = FRAME_NS_DISPLAY_INFO (f);
NSTRACE (x_iconify_frame);
- check_ns ();
+ check_window_system ();
if (dpyinfo->x_highlight_frame == f)
dpyinfo->x_highlight_frame = 0;
@@ -1178,7 +1178,7 @@
struct ns_display_info *dpyinfo = FRAME_NS_DISPLAY_INFO (f);
Mouse_HLInfo *hlinfo = MOUSE_HL_INFO (f);
NSTRACE (x_free_frame_resources);
- check_ns ();
+ check_window_system ();
[(EmacsView *)view setWindowClosing: YES]; /* may not have been informed */
@@ -1219,7 +1219,7 @@
--------------------------------------------------------------------------
*/
{
NSTRACE (x_destroy_window);
- check_ns ();
+ check_window_system ();
x_free_frame_resources (f);
ns_window_num--;
}
=== modified file 'src/w32fns.c'
--- a/src/w32fns.c 2013-03-28 14:04:49 +0000
+++ b/src/w32fns.c 2013-04-05 14:07:02 +0000
@@ -242,7 +242,7 @@
/* Error if we are not connected to MS-Windows. */
void
-check_w32 (void)
+check_window_system (void)
{
if (! w32_in_use)
error ("MS-Windows not in use or not initialized");
@@ -5358,7 +5358,7 @@
Lisp_Object buffer;
struct buffer *old_buffer;
- check_w32 ();
+ check_window_system ();
/* Use this general default value to start with until we know if
this frame has a specified name. */
@@ -7635,8 +7635,6 @@
defsubr (&Sdefault_printer_name);
defsubr (&Sset_message_beep);
- check_window_system_func = check_w32;
-
hourglass_hwnd = NULL;
defsubr (&Sx_show_tip);
=== modified file 'src/w32menu.c'
--- a/src/w32menu.c 2013-03-28 14:04:49 +0000
+++ b/src/w32menu.c 2013-04-05 14:07:02 +0000
@@ -140,7 +140,7 @@
FRAME_PTR f = NULL;
Lisp_Object window;
- check_w32 ();
+ check_window_system ();
/* Decode the first argument: find the window or frame to use. */
if (EQ (position, Qt)
=== modified file 'src/w32term.h'
--- a/src/w32term.h 2013-03-23 19:40:43 +0000
+++ b/src/w32term.h 2013-04-05 14:07:02 +0000
@@ -203,7 +203,6 @@
extern struct w32_display_info *w32_term_init (Lisp_Object,
char *, char *);
-extern void check_w32 (void);
extern int w32_defined_color (FRAME_PTR f, const char *color,
XColor *color_def, int alloc);
extern void x_set_window_size (struct frame *f, int change_grav,
=== modified file 'src/xfaces.c'
--- a/src/xfaces.c 2013-03-28 14:04:49 +0000
+++ b/src/xfaces.c 2013-04-05 14:07:02 +0000
@@ -231,7 +231,6 @@
#undef FRAME_X_DISPLAY_INFO
#define FRAME_X_DISPLAY_INFO FRAME_W32_DISPLAY_INFO
#define x_display_info w32_display_info
-#define check_x check_w32
#define GCGraphicsExposures 0
#endif /* HAVE_NTGUI */
@@ -239,7 +238,6 @@
#undef FRAME_X_DISPLAY_INFO
#define FRAME_X_DISPLAY_INFO FRAME_NS_DISPLAY_INFO
#define x_display_info ns_display_info
-#define check_x check_ns
#define GCGraphicsExposures 0
#endif /* HAVE_NS */
#endif /* HAVE_WINDOW_SYSTEM */
@@ -1636,7 +1634,7 @@
struct frame *f;
int size, avgwidth IF_LINT (= 0);
- check_x ();
+ check_window_system ();
CHECK_STRING (pattern);
if (! NILP (maximum))
=== modified file 'src/xfns.c'
--- a/src/xfns.c 2013-03-28 14:04:49 +0000
+++ b/src/xfns.c 2013-04-05 14:07:02 +0000
@@ -143,7 +143,7 @@
/* Error if we are not connected to X. */
void
-check_x (void)
+check_window_system (void)
{
if (! x_in_use)
error ("X windows are not in use or not initialized");
@@ -4525,7 +4525,7 @@
Lisp_Object buffer;
struct buffer *old_buffer;
- check_x ();
+ check_window_system ();
if (!dpyinfo->terminal->name)
error ("Terminal is not live, can't create new frames on it");
@@ -5316,7 +5316,7 @@
ptrdiff_t count = SPECPDL_INDEX ();
struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5, gcpro6;
- check_x ();
+ check_window_system ();
GCPRO6 (prompt, dir, default_filename, mustmatch, only_dir_p, file);
@@ -5486,7 +5486,7 @@
struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5, gcpro6;
char *cdef_file;
- check_x ();
+ check_window_system ();
GCPRO6 (prompt, dir, default_filename, mustmatch, only_dir_p, file);
@@ -5548,7 +5548,7 @@
struct gcpro gcpro1, gcpro2;
ptrdiff_t count = SPECPDL_INDEX ();
- check_x ();
+ check_window_system ();
if (popup_activated ())
error ("Trying to use a menu from within a menu-entry");
@@ -5919,9 +5919,6 @@
defsubr (&Sx_focus_frame);
defsubr (&Sx_backspace_delete_keys_p);
- /* Setting callback functions for fontset handler. */
- check_window_system_func = check_x;
-
defsubr (&Sx_show_tip);
defsubr (&Sx_hide_tip);
tip_timer = Qnil;
=== modified file 'src/xmenu.c'
--- a/src/xmenu.c 2013-03-28 14:04:49 +0000
+++ b/src/xmenu.c 2013-04-05 14:07:02 +0000
@@ -223,7 +223,7 @@
FRAME_PTR f = NULL;
Lisp_Object window;
- check_x ();
+ check_window_system ();
/* Decode the first argument: find the window or frame to use. */
if (EQ (position, Qt)
=== modified file 'src/xterm.h'
--- a/src/xterm.h 2013-01-02 16:13:04 +0000
+++ b/src/xterm.h 2013-04-05 14:07:02 +0000
@@ -366,10 +366,6 @@
extern int use_xim;
#endif
-/* This checks to make sure we have a display. */
-
-extern void check_x (void);
-
extern struct frame *x_window_to_frame (struct x_display_info *, int);
extern struct frame *x_any_window_to_frame (struct x_display_info *, int);
extern struct frame *x_menubar_window_to_frame (struct x_display_info *,
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r112228: Consistently use platform-specific function to detect window system.,
Dmitry Antipov <=