[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r111087: * lisp.h (Mouse_HLInfo): Rem
From: |
Dmitry Antipov |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r111087: * lisp.h (Mouse_HLInfo): Remove set-but-unused mouse_face_image_state |
Date: |
Tue, 04 Dec 2012 19:15:30 +0400 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 111087
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Tue 2012-12-04 19:15:30 +0400
message:
* lisp.h (Mouse_HLInfo): Remove set-but-unused mouse_face_image_state
member. Adjust users. Convert mouse_face_past_end, mouse_face_defer
and mouse_face_hidden members to a bitfields.
* frame.h (struct frame): Remove set-but-not-used space_width member.
(FRAME_SPACE_WIDTH): Remove.
* nsterm.m, w32term.c, xterm.c: Adjust users.
* termchar.h (struct tty_display_info): Remove set-but-unused se_is_so
member. Adjust users. Convert term_initted, delete_in_insert_mode,
costs_set, insert_mode, standout_mode, cursor_hidden and flow_control
members to a bitfields.
modified:
src/ChangeLog
src/frame.h
src/lisp.h
src/nsterm.m
src/term.c
src/termchar.h
src/w32term.c
src/xdisp.c
src/xterm.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2012-12-03 21:42:12 +0000
+++ b/src/ChangeLog 2012-12-04 15:15:30 +0000
@@ -1,3 +1,16 @@
+2012-12-04 Dmitry Antipov <address@hidden>
+
+ * lisp.h (Mouse_HLInfo): Remove set-but-unused mouse_face_image_state
+ member. Adjust users. Convert mouse_face_past_end, mouse_face_defer
+ and mouse_face_hidden members to a bitfields.
+ * frame.h (struct frame): Remove set-but-not-used space_width member.
+ (FRAME_SPACE_WIDTH): Remove.
+ * nsterm.m, w32term.c, xterm.c: Adjust users.
+ * termchar.h (struct tty_display_info): Remove set-but-unused se_is_so
+ member. Adjust users. Convert term_initted, delete_in_insert_mode,
+ costs_set, insert_mode, standout_mode, cursor_hidden and flow_control
+ members to a bitfields.
+
2012-12-03 Paul Eggert <address@hidden>
Don't let call-process be a zombie factory (Bug#12980).
=== modified file 'src/frame.h'
--- a/src/frame.h 2012-11-23 15:39:48 +0000
+++ b/src/frame.h 2012-12-04 15:15:30 +0000
@@ -301,9 +301,6 @@
/* Canonical X unit. Width of default font, in pixels. */
int column_width;
- /* Width of space glyph of default font, in pixels. */
- int space_width;
-
/* Canonical Y unit. Height of a line, in pixels. */
int line_height;
@@ -1000,11 +997,6 @@
#define FRAME_COLUMN_WIDTH(F) ((F)->column_width)
-/* Space glyph width of the default font of frame F. */
-
-#define FRAME_SPACE_WIDTH(F) ((F)->space_width)
-
-
/* Pixel width of areas used to display truncation marks, continuation
marks, overlay arrows. This is 0 for terminal frames. */
=== modified file 'src/lisp.h'
--- a/src/lisp.h 2012-12-03 21:07:47 +0000
+++ b/src/lisp.h 2012-12-04 15:15:30 +0000
@@ -1644,7 +1644,6 @@
int mouse_face_beg_x, mouse_face_beg_y;
int mouse_face_end_row, mouse_face_end_col;
int mouse_face_end_x, mouse_face_end_y;
- int mouse_face_past_end;
Lisp_Object mouse_face_window;
int mouse_face_face_id;
Lisp_Object mouse_face_overlay;
@@ -1654,13 +1653,15 @@
struct frame *mouse_face_mouse_frame;
int mouse_face_mouse_x, mouse_face_mouse_y;
+ /* Nonzero if part of the text currently shown in
+ its mouse-face is beyond the window end. */
+ unsigned mouse_face_past_end : 1;
+
/* Nonzero means defer mouse-motion highlighting. */
- int mouse_face_defer;
+ unsigned mouse_face_defer : 1;
/* Nonzero means that the mouse highlight should not be shown. */
- int mouse_face_hidden;
-
- int mouse_face_image_state;
+ unsigned mouse_face_hidden : 1;
} Mouse_HLInfo;
/* Data type checking. */
=== modified file 'src/nsterm.m'
--- a/src/nsterm.m 2012-11-22 09:32:32 +0000
+++ b/src/nsterm.m 2012-12-04 15:15:30 +0000
@@ -6954,7 +6954,6 @@
FRAME_BASELINE_OFFSET (f) = font->baseline_offset;
FRAME_COLUMN_WIDTH (f) = font->average_width;
- FRAME_SPACE_WIDTH (f) = font->space_width;
FRAME_LINE_HEIGHT (f) = font->height;
compute_fringe_widths (f, 1);
=== modified file 'src/term.c'
--- a/src/term.c 2012-11-17 22:12:47 +0000
+++ b/src/term.c 2012-12-04 15:15:30 +0000
@@ -3362,10 +3362,6 @@
= tty->TS_delete_mode && tty->TS_insert_mode
&& !strcmp (tty->TS_delete_mode, tty->TS_insert_mode);
- tty->se_is_so = (tty->TS_standout_mode
- && tty->TS_end_standout_mode
- && !strcmp (tty->TS_standout_mode, tty->TS_end_standout_mode));
-
UseTabs (tty) = tabs_safe_p (fileno (tty->input)) && TabWidth (tty) == 8;
terminal->scroll_region_ok
=== modified file 'src/termchar.h'
--- a/src/termchar.h 2012-09-04 17:34:54 +0000
+++ b/src/termchar.h 2012-12-04 15:15:30 +0000
@@ -50,8 +50,7 @@
struct emacs_tty *old_tty; /* The initial tty mode bits */
- int term_initted; /* 1 if we have been through init_sys_modes. */
-
+ unsigned term_initted : 1; /* 1 if we have been through init_sys_modes. */
int reference_count; /* Number of frames that are on this display.
*/
@@ -164,17 +163,12 @@
int RPov; /* # chars to start a TS_repeat */
- int delete_in_insert_mode; /* delete mode == insert mode */
-
- int se_is_so; /* 1 if same string both enters and leaves
- standout mode */
-
- int costs_set; /* Nonzero if costs have been calculated. */
-
- int insert_mode; /* Nonzero when in insert mode. */
- int standout_mode; /* Nonzero when in standout mode. */
-
-
+ unsigned delete_in_insert_mode : 1; /* delete mode == insert mode */
+
+ unsigned costs_set : 1; /* Nonzero if costs have been calculated. */
+
+ unsigned insert_mode : 1; /* Nonzero when in insert mode. */
+ unsigned standout_mode : 1; /* Nonzero when in standout mode. */
/* 1 if should obey 0200 bit in input chars as "Meta", 2 if should
keep 0200 bit in input chars. 0 to ignore the 0200 bit. */
@@ -192,11 +186,11 @@
/* Flag used in tty_show/hide_cursor. */
- int cursor_hidden;
+ unsigned cursor_hidden : 1;
/* Nonzero means use ^S/^Q for flow control. */
- int flow_control;
+ unsigned flow_control : 1;
};
/* A chain of structures for all tty devices currently in use. */
=== modified file 'src/w32term.c'
--- a/src/w32term.c 2012-12-01 02:38:11 +0000
+++ b/src/w32term.c 2012-12-04 15:15:30 +0000
@@ -5348,7 +5348,6 @@
FRAME_FONT (f) = font;
FRAME_BASELINE_OFFSET (f) = font->baseline_offset;
FRAME_COLUMN_WIDTH (f) = font->average_width;
- FRAME_SPACE_WIDTH (f) = font->space_width;
FRAME_LINE_HEIGHT (f) = font->height;
compute_fringe_widths (f, 1);
=== modified file 'src/xdisp.c'
--- a/src/xdisp.c 2012-12-03 20:48:12 +0000
+++ b/src/xdisp.c 2012-12-04 15:15:30 +0000
@@ -12265,7 +12265,6 @@
{
/* Show item in pressed state. */
show_mouse_face (hlinfo, DRAW_IMAGE_SUNKEN);
- hlinfo->mouse_face_image_state = DRAW_IMAGE_SUNKEN;
last_tool_bar_item = prop_idx;
}
else
@@ -12276,7 +12275,6 @@
/* Show item in released state. */
show_mouse_face (hlinfo, DRAW_IMAGE_RAISED);
- hlinfo->mouse_face_image_state = DRAW_IMAGE_RAISED;
key = AREF (f->tool_bar_items, prop_idx + TOOL_BAR_ITEM_KEY);
@@ -12345,7 +12343,6 @@
&& last_tool_bar_item != prop_idx)
return;
- hlinfo->mouse_face_image_state = DRAW_NORMAL_TEXT;
draw = mouse_down_p ? DRAW_IMAGE_SUNKEN : DRAW_IMAGE_RAISED;
/* If tool-bar item is not enabled, don't highlight it. */
@@ -12374,7 +12371,6 @@
/* Display it as active. */
show_mouse_face (hlinfo, draw);
- hlinfo->mouse_face_image_state = draw;
}
set_help_echo:
=== modified file 'src/xterm.c'
--- a/src/xterm.c 2012-12-01 23:06:14 +0000
+++ b/src/xterm.c 2012-12-04 15:15:30 +0000
@@ -7902,7 +7902,6 @@
FRAME_FONT (f) = font;
FRAME_BASELINE_OFFSET (f) = font->baseline_offset;
FRAME_COLUMN_WIDTH (f) = font->average_width;
- FRAME_SPACE_WIDTH (f) = font->space_width;
FRAME_LINE_HEIGHT (f) = FONT_HEIGHT (font);
compute_fringe_widths (f, 1);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r111087: * lisp.h (Mouse_HLInfo): Remove set-but-unused mouse_face_image_state,
Dmitry Antipov <=