Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
168f8e73
Commit
168f8e73
authored
Jul 27, 2014
by
Paul Eggert
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* frame.c (x_set_frame_parameters): Don't use uninitialized locals.
parent
72c64ae9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
9 deletions
+12
-9
src/ChangeLog
src/ChangeLog
+4
-0
src/frame.c
src/frame.c
+8
-9
No files found.
src/ChangeLog
View file @
168f8e73
2014-07-28 Paul Eggert <eggert@cs.ucla.edu>
* frame.c (x_set_frame_parameters): Don't use uninitialized locals.
2014-07-27 Jan Djärv <jan.h.d@swipnet.se>
* nsterm.m (applicationDidFinishLaunching antialiasThresholdDidChange):
...
...
src/frame.c
View file @
168f8e73
...
...
@@ -637,7 +637,7 @@ make_frame (bool mini_p)
f
->
column_width
=
1
;
/* !FRAME_WINDOW_P value. */
f
->
line_height
=
1
;
/* !FRAME_WINDOW_P value. */
#ifdef HAVE_WINDOW_SYSTEM
f
->
vertical_scroll_bar_type
=
vertical_scroll_bar_none
;
f
->
vertical_scroll_bar_type
=
vertical_scroll_bar_none
;
f
->
horizontal_scroll_bars
=
false
;
f
->
want_fullscreen
=
FULLSCREEN_NONE
;
#if ! defined (USE_GTK) && ! defined (HAVE_NS)
...
...
@@ -914,10 +914,10 @@ make_terminal_frame (struct terminal *terminal)
FRAME_BACKGROUND_PIXEL
(
f
)
=
FACE_TTY_DEFAULT_BG_COLOR
;
#endif
/* not MSDOS */
#ifdef HAVE_WINDOW_SYSTEM
#ifdef HAVE_WINDOW_SYSTEM
f
->
vertical_scroll_bar_type
=
vertical_scroll_bar_none
;
FRAME_HAS_HORIZONTAL_SCROLL_BARS
(
f
)
=
false
;
#endif
#endif
FRAME_MENU_BAR_LINES
(
f
)
=
NILP
(
Vmenu_bar_mode
)
?
0
:
1
;
FRAME_MENU_BAR_HEIGHT
(
f
)
=
FRAME_MENU_BAR_LINES
(
f
)
*
FRAME_LINE_HEIGHT
(
f
);
...
...
@@ -1666,9 +1666,9 @@ delete_frame (Lisp_Object frame, Lisp_Object force)
fset_buried_buffer_list
(
f
,
Qnil
);
free_font_driver_list
(
f
);
#if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI)
#if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI)
xfree
(
f
->
namebuf
);
#endif
#endif
xfree
(
f
->
decode_mode_spec_buffer
);
xfree
(
FRAME_INSERT_COST
(
f
));
xfree
(
FRAME_DELETEN_COST
(
f
));
...
...
@@ -3203,10 +3203,9 @@ x_set_frame_parameters (struct frame *f, Lisp_Object alist)
XSETFRAME
(
frame
,
f
);
if
((
width_change
||
height_change
)
&&
(
width
!=
FRAME_TEXT_WIDTH
(
f
)
||
height
!=
FRAME_TEXT_HEIGHT
(
f
)
||
f
->
new_height
||
f
->
new_width
))
if
(((
width_change
&&
width
!=
FRAME_TEXT_WIDTH
(
f
))
||
(
height_change
&&
height
!=
FRAME_TEXT_HEIGHT
(
f
)))
&&
(
f
->
new_height
||
f
->
new_width
))
{
/* If necessary provide default values for HEIGHT and WIDTH. Do
that here since otherwise a size change implied by an
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment