* frame.h (FRAME_W32_P, FRAME_MSDOS_P, FRAME_NS_P): Change to
compile time tests instead of run time tests on systems that do not use them. (FRAME_MAC_P): Remove leftover from deleted code. * frame.c (syms_of_frame): Remove leftover from deleted code.
This commit is contained in:
parent
fe72cdc5b2
commit
ff687885ea
3 changed files with 20 additions and 3 deletions
|
@ -1,3 +1,11 @@
|
|||
2012-08-22 Dan Nicolaescu <dann@gnu.org>
|
||||
|
||||
* frame.h (FRAME_W32_P, FRAME_MSDOS_P, FRAME_NS_P): Change to
|
||||
compile time tests instead of run time tests on systems that do
|
||||
not use them.
|
||||
(FRAME_MAC_P): Remove leftover from deleted code.
|
||||
* frame.c (syms_of_frame): Remove leftover from deleted code.
|
||||
|
||||
2012-08-22 Jan Djärv <jan.h.d@swipnet.se>
|
||||
|
||||
* nsterm.m (insertText:): Don't clear modifiers if code is space.
|
||||
|
|
|
@ -4247,7 +4247,6 @@ syms_of_frame (void)
|
|||
DEFSYM (Qx, "x");
|
||||
DEFSYM (Qw32, "w32");
|
||||
DEFSYM (Qpc, "pc");
|
||||
DEFSYM (Qmac, "mac");
|
||||
DEFSYM (Qns, "ns");
|
||||
DEFSYM (Qvisible, "visible");
|
||||
DEFSYM (Qbuffer_predicate, "buffer-predicate");
|
||||
|
|
14
src/frame.h
14
src/frame.h
|
@ -621,11 +621,21 @@ typedef struct frame *FRAME_PTR;
|
|||
#define FRAME_INITIAL_P(f) ((f)->output_method == output_initial)
|
||||
#define FRAME_TERMCAP_P(f) ((f)->output_method == output_termcap)
|
||||
#define FRAME_X_P(f) ((f)->output_method == output_x_window)
|
||||
#ifndef WINDOWSNT
|
||||
#define FRAME_W32_P(f) (0)
|
||||
#else
|
||||
#define FRAME_W32_P(f) ((f)->output_method == output_w32)
|
||||
#endif
|
||||
#ifndef MSDOS
|
||||
#define FRAME_MSDOS_P(f) (0)
|
||||
#else
|
||||
#define FRAME_MSDOS_P(f) ((f)->output_method == output_msdos_raw)
|
||||
#define FRAME_MAC_P(f) ((f)->output_method == output_mac)
|
||||
#endif
|
||||
#ifndef HAVE_NS
|
||||
#define FRAME_NS_P(f) (0)
|
||||
#else
|
||||
#define FRAME_NS_P(f) ((f)->output_method == output_ns)
|
||||
|
||||
#endif
|
||||
/* FRAME_WINDOW_P tests whether the frame is a window, and is
|
||||
defined to be the predicate for the window system being used. */
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue