[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r114289: * frame.h (FRAME_SMALLEST_CHAR_WIDTH, FRAME
From: |
Dmitry Antipov |
Subject: |
[Emacs-diffs] trunk r114289: * frame.h (FRAME_SMALLEST_CHAR_WIDTH, FRAME_SMALLEST_FONT_HEIGHT): |
Date: |
Sun, 15 Sep 2013 07:06:35 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 114289
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Sun 2013-09-15 11:06:05 +0400
message:
* frame.h (FRAME_SMALLEST_CHAR_WIDTH, FRAME_SMALLEST_FONT_HEIGHT):
Define once here...
* nsterm.h, w32term.h, xterm.h: ...and not here.
modified:
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/frame.h frame.h-20091113204419-o5vbwnq5f7feedwu-229
src/nsterm.h nsterm.h-20091113204419-o5vbwnq5f7feedwu-8746
src/w32term.h w32term.h-20091113204419-o5vbwnq5f7feedwu-954
src/xterm.h xterm.h-20091113204419-o5vbwnq5f7feedwu-228
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2013-09-15 06:50:41 +0000
+++ b/src/ChangeLog 2013-09-15 07:06:05 +0000
@@ -2,6 +2,9 @@
* xterm.h (FRAME_X_SCREEN_NUMBER): Add comment.
(BLACK_PIX_DEFAULT, WHITE_PIX_DEFAULT): Use FRAME_X_SCREEN_NUMBER.
+ * frame.h (FRAME_SMALLEST_CHAR_WIDTH, FRAME_SMALLEST_FONT_HEIGHT):
+ Define once here...
+ * nsterm.h, w32term.h, xterm.h: ...and not here.
2013-09-14 Eli Zaretskii <address@hidden>
=== modified file 'src/frame.h'
--- a/src/frame.h 2013-09-13 16:46:18 +0000
+++ b/src/frame.h 2013-09-15 07:06:05 +0000
@@ -1131,6 +1131,15 @@
(FRAME_PIXEL_Y_TO_LINE (f, ((height) \
- FRAME_INTERNAL_BORDER_WIDTH (f))))
+/* Value is the smallest width of any character in any font on frame F. */
+
+#define FRAME_SMALLEST_CHAR_WIDTH(f) \
+ FRAME_DISPLAY_INFO (f)->smallest_char_width
+
+/* Value is the smallest height of any font on frame F. */
+
+#define FRAME_SMALLEST_FONT_HEIGHT(f) \
+ FRAME_DISPLAY_INFO (f)->smallest_font_height
/***********************************************************************
Frame Parameters
=== modified file 'src/nsterm.h'
--- a/src/nsterm.h 2013-09-13 15:03:51 +0000
+++ b/src/nsterm.h 2013-09-15 07:06:05 +0000
@@ -746,10 +746,6 @@
#define FRAME_FONTSET(f) ((f)->output_data.ns->fontset)
-#define FRAME_SMALLEST_CHAR_WIDTH(f) \
- (FRAME_DISPLAY_INFO (f)->smallest_char_width)
-#define FRAME_SMALLEST_FONT_HEIGHT(f) \
- (FRAME_DISPLAY_INFO (f)->smallest_font_height)
#define FRAME_BASELINE_OFFSET(f) ((f)->output_data.ns->baseline_offset)
#define BLACK_PIX_DEFAULT(f) 0x000000
#define WHITE_PIX_DEFAULT(f) 0xFFFFFF
=== modified file 'src/w32term.h'
--- a/src/w32term.h 2013-09-13 16:46:18 +0000
+++ b/src/w32term.h 2013-09-15 07:06:05 +0000
@@ -382,16 +382,6 @@
/* This is the `Display *' which frame F is on. */
#define FRAME_X_DISPLAY(f) (0)
-/* Value is the smallest width of any character in any font on frame F. */
-
-#define FRAME_SMALLEST_CHAR_WIDTH(F) \
- FRAME_DISPLAY_INFO(F)->smallest_char_width
-
-/* Value is the smallest height of any font on frame F. */
-
-#define FRAME_SMALLEST_FONT_HEIGHT(F) \
- FRAME_DISPLAY_INFO(F)->smallest_font_height
-
#define FRAME_NORMAL_PLACEMENT(F) ((F)->output_data.w32->normal_placement)
#define FRAME_PREV_FSMODE(F) ((F)->output_data.w32->prev_fsmode)
=== modified file 'src/xterm.h'
--- a/src/xterm.h 2013-09-15 06:50:41 +0000
+++ b/src/xterm.h 2013-09-15 07:06:05 +0000
@@ -734,16 +734,6 @@
#define FRAME_XIC_STYLE(f) ((f)->output_data.x->xic_style)
#define FRAME_XIC_FONTSET(f) ((f)->output_data.x->xic_xfs)
-/* Value is the smallest width of any character in any font on frame F. */
-
-#define FRAME_SMALLEST_CHAR_WIDTH(F) \
- FRAME_DISPLAY_INFO(F)->smallest_char_width
-
-/* Value is the smallest height of any font on frame F. */
-
-#define FRAME_SMALLEST_FONT_HEIGHT(F) \
- FRAME_DISPLAY_INFO(F)->smallest_font_height
-
/* X-specific scroll bar stuff. */
/* We represent scroll bars as lisp vectors. This allows us to place
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r114289: * frame.h (FRAME_SMALLEST_CHAR_WIDTH, FRAME_SMALLEST_FONT_HEIGHT):,
Dmitry Antipov <=