aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGerd Moellmann1999-12-10 08:55:12 +0000
committerGerd Moellmann1999-12-10 08:55:12 +0000
commitdfa1c6ae2c3ff364c935f383170093826a950284 (patch)
tree964560d4aabb754264e3bbdbc711cf72a4eac69a /src
parent3da48525dc9e69c4f1917734d8e9f4f5bad2ed81 (diff)
downloademacs-dfa1c6ae2c3ff364c935f383170093826a950284.tar.gz
emacs-dfa1c6ae2c3ff364c935f383170093826a950284.zip
(FRAME_FOREGROUND_PIXEL, FRAME_BACKGROUND_PIXEL): Moved
to frame.h.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog8
-rw-r--r--src/xterm.h2
2 files changed, 8 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index f0eabbaf380..a54f77e1633 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
11999-12-10 Gerd Moellmann <gerd@gnu.org>
2
3 * frame.h (FRAME_FOREGROUND_PIXEL, FRAME_BACKGROUND_PIXEL)
4 [!MSDOS && !WINDOWSNT && !macintosh]: Moved here from xterm.h.
5
6 * xterm.h (FRAME_FOREGROUND_PIXEL, FRAME_BACKGROUND_PIXEL): Moved
7 to frame.h.
8
11999-12-09 Stefan Monnier <monnier@cs.yale.edu> 91999-12-09 Stefan Monnier <monnier@cs.yale.edu>
2 10
3 * keyboard.c (Qratio): New symbol. 11 * keyboard.c (Qratio): New symbol.
diff --git a/src/xterm.h b/src/xterm.h
index 6b11c71f25d..734bdb180b7 100644
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -577,8 +577,6 @@ struct x_output
577#define FRAME_OUTER_WINDOW(f) (FRAME_X_WINDOW (f)) 577#define FRAME_OUTER_WINDOW(f) (FRAME_X_WINDOW (f))
578#endif 578#endif
579 579
580#define FRAME_FOREGROUND_PIXEL(f) ((f)->output_data.x->foreground_pixel)
581#define FRAME_BACKGROUND_PIXEL(f) ((f)->output_data.x->background_pixel)
582#define FRAME_FONT(f) ((f)->output_data.x->font) 580#define FRAME_FONT(f) ((f)->output_data.x->font)
583#define FRAME_FONTSET(f) ((f)->output_data.x->fontset) 581#define FRAME_FONTSET(f) ((f)->output_data.x->fontset)
584#define FRAME_INTERNAL_BORDER_WIDTH(f) ((f)->output_data.x->internal_border_width) 582#define FRAME_INTERNAL_BORDER_WIDTH(f) ((f)->output_data.x->internal_border_width)