[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r106239: * src/frame.h (MOUSE_HL_INFO
|
From: |
Andreas Schwab |
|
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r106239: * src/frame.h (MOUSE_HL_INFO): Remove excess parens. |
|
Date: |
Sat, 29 Oct 2011 17:50:30 +0200 |
|
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 106239
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Sat 2011-10-29 17:50:30 +0200
message:
* src/frame.h (MOUSE_HL_INFO): Remove excess parens.
modified:
src/ChangeLog
src/frame.h
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2011-10-29 13:38:21 +0000
+++ b/src/ChangeLog 2011-10-29 15:50:30 +0000
@@ -1,3 +1,7 @@
+2011-10-29 Andreas Schwab <address@hidden>
+
+ * frame.h (MOUSE_HL_INFO): Remove excess parens.
+
2011-10-29 Eli Zaretskii <address@hidden>
Fix the `xbytecode' command.
=== modified file 'src/frame.h'
--- a/src/frame.h 2011-07-28 21:51:29 +0000
+++ b/src/frame.h 2011-10-29 15:50:30 +0000
@@ -538,12 +538,12 @@
does not have FRAME_X_DISPLAY_INFO. */
#ifdef HAVE_WINDOW_SYSTEM
# define MOUSE_HL_INFO(F) \
- (FRAME_WINDOW_P(F) \
- ? &(FRAME_X_DISPLAY_INFO(F)->mouse_highlight) \
- : &(((F)->output_data.tty->display_info)->mouse_highlight))
+ (FRAME_WINDOW_P(F) \
+ ? &FRAME_X_DISPLAY_INFO(F)->mouse_highlight \
+ : &(F)->output_data.tty->display_info->mouse_highlight)
#else
# define MOUSE_HL_INFO(F) \
- (&(((F)->output_data.tty->display_info)->mouse_highlight))
+ (&(F)->output_data.tty->display_info->mouse_highlight)
#endif
/* Nonzero if frame F is still alive (not deleted). */
@@ -594,7 +594,7 @@
/* Lines above the top-most window in frame F. */
#define FRAME_TOP_MARGIN(F) \
- (FRAME_MENU_BAR_LINES (F) + FRAME_TOOL_BAR_LINES (F))
+ (FRAME_MENU_BAR_LINES (F) + FRAME_TOOL_BAR_LINES (F))
/* Pixel height of the top margin above. */
@@ -659,11 +659,11 @@
and which side they are on. */
#define FRAME_VERTICAL_SCROLL_BAR_TYPE(f) ((f)->vertical_scroll_bar_type)
#define FRAME_HAS_VERTICAL_SCROLL_BARS(f) \
- ((f)->vertical_scroll_bar_type != vertical_scroll_bar_none)
+ ((f)->vertical_scroll_bar_type != vertical_scroll_bar_none)
#define FRAME_HAS_VERTICAL_SCROLL_BARS_ON_LEFT(f) \
- ((f)->vertical_scroll_bar_type == vertical_scroll_bar_left)
+ ((f)->vertical_scroll_bar_type == vertical_scroll_bar_left)
#define FRAME_HAS_VERTICAL_SCROLL_BARS_ON_RIGHT(f) \
- ((f)->vertical_scroll_bar_type == vertical_scroll_bar_right)
+ ((f)->vertical_scroll_bar_type == vertical_scroll_bar_right)
/* Width that a scroll bar in frame F should have, if there is one.
Measured in pixels.
@@ -680,13 +680,13 @@
the right in this frame, or there are no scroll bars, value is 0. */
#define FRAME_LEFT_SCROLL_BAR_COLS(f) \
- (FRAME_HAS_VERTICAL_SCROLL_BARS_ON_LEFT (f) \
- ? FRAME_CONFIG_SCROLL_BAR_COLS (f) \
- : 0)
+ (FRAME_HAS_VERTICAL_SCROLL_BARS_ON_LEFT (f) \
+ ? FRAME_CONFIG_SCROLL_BAR_COLS (f) \
+ : 0)
/* Width of a left scroll bar in frame F, measured in pixels */
-#define FRAME_LEFT_SCROLL_BAR_AREA_WIDTH(f)
\
+#define FRAME_LEFT_SCROLL_BAR_AREA_WIDTH(f) \
(FRAME_HAS_VERTICAL_SCROLL_BARS_ON_LEFT (f) \
? (FRAME_CONFIG_SCROLL_BAR_COLS (f) * FRAME_COLUMN_WIDTH (f)) \
: 0)
@@ -696,13 +696,13 @@
the left in this frame, or there are no scroll bars, value is 0. */
#define FRAME_RIGHT_SCROLL_BAR_COLS(f) \
- (FRAME_HAS_VERTICAL_SCROLL_BARS_ON_RIGHT (f) \
- ? FRAME_CONFIG_SCROLL_BAR_COLS (f) \
- : 0)
+ (FRAME_HAS_VERTICAL_SCROLL_BARS_ON_RIGHT (f) \
+ ? FRAME_CONFIG_SCROLL_BAR_COLS (f) \
+ : 0)
/* Width of a right scroll bar area in frame F, measured in pixels */
-#define FRAME_RIGHT_SCROLL_BAR_AREA_WIDTH(f)
\
+#define FRAME_RIGHT_SCROLL_BAR_AREA_WIDTH(f) \
(FRAME_HAS_VERTICAL_SCROLL_BARS_ON_RIGHT (f) \
? (FRAME_CONFIG_SCROLL_BAR_COLS (f) * FRAME_COLUMN_WIDTH (f)) \
: 0)
@@ -710,9 +710,9 @@
/* Actual width of a scroll bar in frame F, measured in columns. */
#define FRAME_SCROLL_BAR_COLS(f) \
- (FRAME_HAS_VERTICAL_SCROLL_BARS (f) \
- ? FRAME_CONFIG_SCROLL_BAR_COLS (f) \
- : 0)
+ (FRAME_HAS_VERTICAL_SCROLL_BARS (f) \
+ ? FRAME_CONFIG_SCROLL_BAR_COLS (f) \
+ : 0)
/* Actual width of a scroll bar area in frame F, measured in pixels. */
@@ -731,21 +731,21 @@
not including scroll bars and fringes. */
#define SET_FRAME_COLS(f, val) \
- (FRAME_COLS (f) = (val), \
- (f)->total_cols = FRAME_TOTAL_COLS_ARG (f, FRAME_COLS (f)))
+ (FRAME_COLS (f) = (val), \
+ (f)->total_cols = FRAME_TOTAL_COLS_ARG (f, FRAME_COLS (f)))
/* Given a value WIDTH for frame F's nominal width,
return the value that FRAME_TOTAL_COLS should have. */
#define FRAME_TOTAL_COLS_ARG(f, width) \
- ((width) \
- + FRAME_SCROLL_BAR_COLS (f) \
- + FRAME_FRINGE_COLS (f))
+ ((width) \
+ + FRAME_SCROLL_BAR_COLS (f) \
+ + FRAME_FRINGE_COLS (f))
/* Maximum + 1 legitimate value for FRAME_CURSOR_X. */
#define FRAME_CURSOR_X_LIMIT(f) \
- (FRAME_COLS (f) + FRAME_LEFT_SCROLL_BAR_COLS (f))
+ (FRAME_COLS (f) + FRAME_LEFT_SCROLL_BAR_COLS (f))
/* Nonzero if frame F has scroll bars. */
@@ -938,18 +938,18 @@
float. Value is a C integer. */
#define FRAME_PIXEL_X_FROM_CANON_X(F, X) \
- (INTEGERP (X) \
- ? XINT (X) * FRAME_COLUMN_WIDTH (F) \
- : (int) (XFLOAT_DATA (X) * FRAME_COLUMN_WIDTH (F)))
+ (INTEGERP (X) \
+ ? XINT (X) * FRAME_COLUMN_WIDTH (F) \
+ : (int) (XFLOAT_DATA (X) * FRAME_COLUMN_WIDTH (F)))
/* Convert canonical value Y to pixels. F is the frame whose
canonical character height is to be used. X must be a Lisp integer
or float. Value is a C integer. */
#define FRAME_PIXEL_Y_FROM_CANON_Y(F, Y) \
- (INTEGERP (Y) \
- ? XINT (Y) * FRAME_LINE_HEIGHT (F) \
- : (int) (XFLOAT_DATA (Y) * FRAME_LINE_HEIGHT (F)))
+ (INTEGERP (Y) \
+ ? XINT (Y) * FRAME_LINE_HEIGHT (F) \
+ : (int) (XFLOAT_DATA (Y) * FRAME_LINE_HEIGHT (F)))
/* Convert pixel-value X to canonical units. F is the frame whose
canonical character width is to be used. X is a C integer. Result
@@ -957,9 +957,9 @@
otherwise it's a Lisp integer. */
#define FRAME_CANON_X_FROM_PIXEL_X(F, X) \
- ((X) % FRAME_COLUMN_WIDTH (F) != 0 \
- ? make_float ((double) (X) / FRAME_COLUMN_WIDTH (F)) \
- : make_number ((X) / FRAME_COLUMN_WIDTH (F)))
+ ((X) % FRAME_COLUMN_WIDTH (F) != 0 \
+ ? make_float ((double) (X) / FRAME_COLUMN_WIDTH (F)) \
+ : make_number ((X) / FRAME_COLUMN_WIDTH (F)))
/* Convert pixel-value Y to canonical units. F is the frame whose
canonical character height is to be used. Y is a C integer.
@@ -967,9 +967,9 @@
otherwise it's a Lisp integer. */
#define FRAME_CANON_Y_FROM_PIXEL_Y(F, Y) \
- ((Y) % FRAME_LINE_HEIGHT (F) \
- ? make_float ((double) (Y) / FRAME_LINE_HEIGHT (F)) \
- : make_number ((Y) / FRAME_LINE_HEIGHT (F)))
+ ((Y) % FRAME_LINE_HEIGHT (F) \
+ ? make_float ((double) (Y) / FRAME_LINE_HEIGHT (F)) \
+ : make_number ((Y) / FRAME_LINE_HEIGHT (F)))
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r106239: * src/frame.h (MOUSE_HL_INFO): Remove excess parens.,
Andreas Schwab <=