[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r110779: * frame.h (struct frame): Dr
From: |
Dmitry Antipov |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r110779: * frame.h (struct frame): Drop can_have_scroll_bars member |
Date: |
Sat, 03 Nov 2012 09:59:17 +0400 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 110779
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Sat 2012-11-03 09:59:17 +0400
message:
* frame.h (struct frame): Drop can_have_scroll_bars member
which is meaningless for a long time. Adjust comments.
(FRAME_CAN_HAVE_SCROLL_BARS): Remove.
* frame.c, nsfns.m, term.c, w32fns.c, xfns.c: Adjust users.
modified:
src/ChangeLog
src/frame.c
src/frame.h
src/nsfns.m
src/term.c
src/w32fns.c
src/xfns.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2012-11-03 05:11:34 +0000
+++ b/src/ChangeLog 2012-11-03 05:59:17 +0000
@@ -1,5 +1,12 @@
2012-11-03 Dmitry Antipov <address@hidden>
+ * frame.h (struct frame): Drop can_have_scroll_bars member
+ which is meaningless for a long time. Adjust comments.
+ (FRAME_CAN_HAVE_SCROLL_BARS): Remove.
+ * frame.c, nsfns.m, term.c, w32fns.c, xfns.c: Adjust users.
+
+2012-11-03 Dmitry Antipov <address@hidden>
+
* window.c (decode_next_window_args): Update window arg after
calling decode_live_window and so fix crash reported at
http://lists.gnu.org/archive/html/emacs-devel/2012-11/msg00035.html
=== modified file 'src/frame.c'
--- a/src/frame.c 2012-10-30 18:28:48 +0000
+++ b/src/frame.c 2012-11-03 05:59:17 +0000
@@ -502,7 +502,6 @@
FRAME_FOREGROUND_PIXEL (f) = FACE_TTY_DEFAULT_FG_COLOR;
FRAME_BACKGROUND_PIXEL (f) = FACE_TTY_DEFAULT_BG_COLOR;
- FRAME_CAN_HAVE_SCROLL_BARS (f) = 0;
FRAME_VERTICAL_SCROLL_BAR_TYPE (f) = vertical_scroll_bar_none;
/* The default value of menu-bar-mode is t. */
@@ -551,7 +550,6 @@
FRAME_BACKGROUND_PIXEL (f) = FACE_TTY_DEFAULT_BG_COLOR;
#endif /* not MSDOS */
- FRAME_CAN_HAVE_SCROLL_BARS (f) = 0;
FRAME_VERTICAL_SCROLL_BAR_TYPE (f) = vertical_scroll_bar_none;
FRAME_MENU_BAR_LINES(f) = NILP (Vmenu_bar_mode) ? 0 : 1;
=== modified file 'src/frame.h'
--- a/src/frame.h 2012-10-20 21:30:51 +0000
+++ b/src/frame.h 2012-11-03 05:59:17 +0000
@@ -409,10 +409,6 @@
show no modeline for that window. */
unsigned wants_modeline : 1;
- /* Non-zero if the hardware device this frame is displaying on can
- support scroll bars. */
- char can_have_scroll_bars;
-
/* Non-0 means raise this frame to the top of the heap when selected. */
unsigned auto_raise : 1;
@@ -438,8 +434,7 @@
/* Nonzero means that the pointer is invisible. */
unsigned pointer_invisible :1;
- /* If can_have_scroll_bars is non-zero, this is non-zero if we should
- actually display them on this frame. */
+ /* Nonzero if we should actually display the scroll bars on this frame. */
enum vertical_scroll_bar_type vertical_scroll_bar_type;
/* What kind of text cursor should we draw in the future?
@@ -767,11 +762,6 @@
#define FRAME_SCROLL_BOTTOM_VPOS(f) (f)->scroll_bottom_vpos
#define FRAME_FOCUS_FRAME(f) f->focus_frame
-/* Nonzero if frame F supports scroll bars.
- If this is zero, then it is impossible to enable scroll bars
- on frame F. */
-#define FRAME_CAN_HAVE_SCROLL_BARS(f) ((f)->can_have_scroll_bars)
-
/* This frame slot says whether scroll bars are currently enabled for frame F,
and which side they are on. */
#define FRAME_VERTICAL_SCROLL_BAR_TYPE(f) ((f)->vertical_scroll_bar_type)
=== modified file 'src/nsfns.m'
--- a/src/nsfns.m 2012-10-07 10:07:23 +0000
+++ b/src/nsfns.m 2012-11-03 05:59:17 +0000
@@ -1175,7 +1175,6 @@
f = make_frame (1);
XSETFRAME (frame, f);
- FRAME_CAN_HAVE_SCROLL_BARS (f) = 1;
f->terminal = dpyinfo->terminal;
=== modified file 'src/term.c'
--- a/src/term.c 2012-10-25 04:35:39 +0000
+++ b/src/term.c 2012-11-03 05:59:17 +0000
@@ -3235,7 +3235,6 @@
FrameCols (tty) = FRAME_COLS (f);
tty->specified_window = FRAME_LINES (f);
- FRAME_CAN_HAVE_SCROLL_BARS (f) = 0;
FRAME_VERTICAL_SCROLL_BAR_TYPE (f) = vertical_scroll_bar_none;
terminal->char_ins_del_ok = 1;
baud_rate = 19200;
=== modified file 'src/w32fns.c'
--- a/src/w32fns.c 2012-11-02 14:00:45 +0000
+++ b/src/w32fns.c 2012-11-03 05:59:17 +0000
@@ -4284,9 +4284,6 @@
XSETFRAME (frame, f);
- /* Note that Windows does support scroll bars. */
- FRAME_CAN_HAVE_SCROLL_BARS (f) = 1;
-
/* By default, make scrollbars the system standard width. */
FRAME_CONFIG_SCROLL_BAR_WIDTH (f) = GetSystemMetrics (SM_CXVSCROLL);
@@ -5387,7 +5384,6 @@
Finsert (1, &text);
set_buffer_internal_1 (old_buffer);
- FRAME_CAN_HAVE_SCROLL_BARS (f) = 0;
record_unwind_protect (unwind_create_tip_frame, frame);
/* By setting the output method, we're essentially saying that
=== modified file 'src/xfns.c'
--- a/src/xfns.c 2012-09-30 13:43:47 +0000
+++ b/src/xfns.c 2012-11-03 05:59:17 +0000
@@ -3111,9 +3111,6 @@
XSETFRAME (frame, f);
- /* Note that X Windows does support scroll bars. */
- FRAME_CAN_HAVE_SCROLL_BARS (f) = 1;
-
f->terminal = dpyinfo->terminal;
f->output_method = output_x_window;
@@ -4596,7 +4593,6 @@
Finsert (1, &text);
set_buffer_internal_1 (old_buffer);
- FRAME_CAN_HAVE_SCROLL_BARS (f) = 0;
record_unwind_protect (unwind_create_tip_frame, frame);
f->terminal = dpyinfo->terminal;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r110779: * frame.h (struct frame): Drop can_have_scroll_bars member,
Dmitry Antipov <=