aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKim F. Storm2005-01-16 19:18:31 +0000
committerKim F. Storm2005-01-16 19:18:31 +0000
commite24531b776e6092d1895a80065a7a0e4a6e1fce1 (patch)
treefcfe56ed8a3811b2e81a013fe719ae9af394ebe2 /src
parent5ddd7664e9b52a6f98cad3fe626fefb7ff3c22b3 (diff)
downloademacs-e24531b776e6092d1895a80065a7a0e4a6e1fce1.tar.gz
emacs-e24531b776e6092d1895a80065a7a0e4a6e1fce1.zip
(syms_of_macterm) <mac-allow-anti-aliasing>: Doc fix.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog20
-rw-r--r--src/macterm.c6
2 files changed, 16 insertions, 10 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 394d5bd11ef..7f0cb64b2c5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12005-01-16 Kim F. Storm <storm@cua.dk>
2
3 * macterm.c (syms_of_macterm) <mac-allow-anti-aliasing>: Doc fix.
4
12005-01-16 Steven Tamm <steventamm@mac.com> 52005-01-16 Steven Tamm <steventamm@mac.com>
2 6
3 * macterm.c (mac_to_x_fontname): Removed spurious argument. 7 * macterm.c (mac_to_x_fontname): Removed spurious argument.
@@ -14,9 +18,9 @@
142005-01-16 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> 182005-01-16 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
15 19
16 * keyboard.c (READABLE_EVENTS_DO_TIMERS_NOW) 20 * keyboard.c (READABLE_EVENTS_DO_TIMERS_NOW)
17 (READABLE_EVENTS_FILTER_EVENTS) 21 (READABLE_EVENTS_FILTER_EVENTS, READABLE_EVENTS_IGNORE_SQUEEZABLES):
18 (READABLE_EVENTS_IGNORE_SQUEEZABLES): New flags for readable_events. 22 New flags for readable_events.
19 get_filtered_input_pending, readable_filtered_events): Removed. 23 (get_filtered_input_pending, readable_filtered_events): Removed.
20 (tracking_off): Call readable_events and get_input_pending with 24 (tracking_off): Call readable_events and get_input_pending with
21 flag READABLE_EVENTS_DO_TIMERS_NOW. 25 flag READABLE_EVENTS_DO_TIMERS_NOW.
22 (readable_events): Move code from old readable_filtered_events here, 26 (readable_events): Move code from old readable_filtered_events here,
@@ -26,7 +30,7 @@
26 READABLE_EVENTS_IGNORE_SQUEEZABLES is not set in flags. 30 READABLE_EVENTS_IGNORE_SQUEEZABLES is not set in flags.
27 (swallow_events): Call get_input_pending with flag 31 (swallow_events): Call get_input_pending with flag
28 READABLE_EVENTS_DO_TIMERS_NOW. 32 READABLE_EVENTS_DO_TIMERS_NOW.
29 (get_input_pending): Move code from old get_filtered_input_pending 33 (get_input_pending): Move code from old get_filtered_input_pending
30 here. Replace boolean arguments do_timers_now, filter_events with 34 here. Replace boolean arguments do_timers_now, filter_events with
31 flags, and pass flags to readable_events. Document new 35 flags, and pass flags to readable_events. Document new
32 READABLE_EVENTS_* flags. 36 READABLE_EVENTS_* flags.
@@ -38,16 +42,16 @@
38 42
39 * dispnew.c (update_window, update_frame_1): Replace calls to 43 * dispnew.c (update_window, update_frame_1): Replace calls to
40 detect_input_pending with detect_input_pending_ignore_squeezables 44 detect_input_pending with detect_input_pending_ignore_squeezables
41 so that redisplay is not paused if the event queue contains only 45 so that redisplay is not paused if the event queue contains only
42 mouse movements. 46 mouse movements.
43 47
44 * lisp.h: Declare detect_input_pending_ignore_squeezables. 48 * lisp.h: Declare detect_input_pending_ignore_squeezables.
45 49
462005-01-15 Steven Tamm <steventamm@mac.com> 502005-01-15 Steven Tamm <steventamm@mac.com>
47 51
48 * macterm.c (Vmac_use_core_graphics): defined for 52 * macterm.c (Vmac_use_core_graphics): Declare variable for
49 mac-allow-anti-aliasing 53 mac-allow-anti-aliasing.
50 (syms_of_macterm): Added mac-allow-anti-aliasing 54 (syms_of_macterm): DEFVAR_LISP and initialize it.
51 (mac_draw_string_common): Use core graphics text rendering if 55 (mac_draw_string_common): Use core graphics text rendering if
52 mac-allow-anti-aliasing is enabled. 56 mac-allow-anti-aliasing is enabled.
53 57
diff --git a/src/macterm.c b/src/macterm.c
index 9e454f25ceb..ebebb129bb8 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -6798,7 +6798,7 @@ XLoadQueryFont (Display *dpy, char *fontname)
6798 font->max_bounds.width = max_width; 6798 font->max_bounds.width = max_width;
6799 } 6799 }
6800 } 6800 }
6801 6801
6802 TextFont (old_fontnum); /* restore previous font number, size and face */ 6802 TextFont (old_fontnum); /* restore previous font number, size and face */
6803 TextSize (old_fontsize); 6803 TextSize (old_fontsize);
6804 TextFace (old_fontface); 6804 TextFace (old_fontface);
@@ -9924,7 +9924,9 @@ Toolbox for processing before Emacs sees it. */);
9924#endif 9924#endif
9925 9925
9926 DEFVAR_LISP ("mac-allow-anti-aliasing", &Vmac_use_core_graphics, 9926 DEFVAR_LISP ("mac-allow-anti-aliasing", &Vmac_use_core_graphics,
9927 doc: /* If non-nil, the text will be rendered using Core Graphics text rendering which may anti-alias the text. */); 9927 doc: /* If non-nil, allow anti-aliasing.
9928The text will be rendered using Core Graphics text rendering which
9929may anti-alias the text. */);
9928 Vmac_use_core_graphics = Qnil; 9930 Vmac_use_core_graphics = Qnil;
9929 9931
9930 DEFVAR_INT ("mac-keyboard-text-encoding", &mac_keyboard_text_encoding, 9932 DEFVAR_INT ("mac-keyboard-text-encoding", &mac_keyboard_text_encoding,