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
e483264c
Commit
e483264c
authored
Oct 28, 2012
by
Stefan Monnier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* src/frame.c (x_set_font): Catch internal error.
parent
15a8af19
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
8 deletions
+15
-8
src/ChangeLog
src/ChangeLog
+12
-8
src/frame.c
src/frame.c
+3
-0
No files found.
src/ChangeLog
View file @
e483264c
2012-10-28 Stefan Monnier <monnier@iro.umontreal.ca>
* frame.c (x_set_font): Catch internal error.
2012-10-27 Eli Zaretskii <eliz@gnu.org>
Avoid overflow in w32 implementation of interval timers.
When
possible, for ITIMER_PROF count only times the main thread
Avoid overflow in w32 implementation of interval timers.
When
possible, for ITIMER_PROF count only times the main thread
actually executes.
* w32proc.c <struct itimer_data>: 'expire' and 'reload' are now
'volatile ULONGLONG' types. All the other data which was
...
...
@@ -11,8 +15,8 @@
for the timer.
(timer_loop): Enter critical section when accessing ULONGLONG
values of the itimer_data struct, as these accesses are no longer
atomic. Call 'w32_get_timer_time' instead of 'clock'.
Remove
unused variable.
atomic. Call 'w32_get_timer_time' instead of 'clock'.
Remove
unused variable.
(init_timers): Initialize s_pfn_Get_Thread_Times.
(start_timer_thread): Don't assign itimer->caller_thread here.
(getitimer): Assign itimer->caller_thread here.
...
...
@@ -92,8 +96,8 @@
2012-10-19 Eli Zaretskii <eliz@gnu.org>
* puresize.h (BASE_PURESIZE): Bump the base value to 1700000.
See
http://lists.gnu.org/archive/html/emacs-devel/2012-10/msg00593.html
* puresize.h (BASE_PURESIZE): Bump the base value to 1700000.
See
http://lists.gnu.org/archive/html/emacs-devel/2012-10/msg00593.html
for the reasons.
* alloc.c (NSTATICS): Decrease to 0x800.
...
...
@@ -712,8 +716,8 @@
(ns_clear_frame_area): Remove resize handle code.
* nsfns.m (ns_in_resize): Remove.
(x_set_icon_name, ns_set_name, ns_set_name_as_filename):
Remove
ns_in_resize check.
(x_set_icon_name, ns_set_name, ns_set_name_as_filename):
Remove
ns_in_resize check.
2012-10-07 Paul Eggert <eggert@cs.ucla.edu>
...
...
src/frame.c
View file @
e483264c
...
...
@@ -3242,6 +3242,9 @@ x_set_font (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
Lisp_Object
ascii_font
=
fontset_ascii
(
fontset
);
Lisp_Object
spec
=
font_spec_from_name
(
ascii_font
);
if
(
NILP
(
spec
))
signal_error
(
"Invalid font name"
,
ascii_font
);
if
(
!
font_match_p
(
spec
,
font_object
))
fontset
=
-
1
;
}
...
...
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