From 9074a684990600abd9dfad0477c7cd1d2f339ed3 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 21 Feb 2015 14:54:08 +0200 Subject: [PATCH] Prefer 'Qfoo' to 'intern ("foo")' in w32 source files src/w32term.c (queue_notifications): src/w32inevt.c (handle_file_notifications): src/w32font.c (w32_enumfont_pattern_entity): Prefer 'Qfoo' to 'intern ("foo")'. --- src/ChangeLog | 7 +++++++ src/w32font.c | 8 ++++---- src/w32inevt.c | 2 +- src/w32term.c | 2 +- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 1692c3f6f70..8604cfcb29f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2015-02-21 Eli Zaretskii + + * w32term.c (queue_notifications): + * w32inevt.c (handle_file_notifications): + * w32font.c (w32_enumfont_pattern_entity): Prefer 'Qfoo' to + 'intern ("foo")'. + 2015-02-21 Paul Eggert Prefer 'Qfoo' to 'intern ("foo")' diff --git a/src/w32font.c b/src/w32font.c index 360ad3f1c48..422f082e72b 100644 --- a/src/w32font.c +++ b/src/w32font.c @@ -1072,11 +1072,11 @@ w32_enumfont_pattern_entity (Lisp_Object frame, truetype so that this information is not any worse than we could have obtained later. */ if (EQ (backend, Quniscribe) && (full_type & NTMFLAGS_OPENTYPE)) - tem = intern ("opentype"); + tem = Qopentype; else if (font_type & TRUETYPE_FONTTYPE) tem = intern ("truetype"); else if (full_type & NTM_PS_OPENTYPE) - tem = intern ("postscript"); + tem = Qpostscript; else if (full_type & NTM_TYPE1) tem = intern ("type1"); else if (font_type & RASTER_FONTTYPE) @@ -1875,10 +1875,10 @@ static Lisp_Object w32_to_fc_weight (int n) { if (n >= FW_EXTRABOLD) return intern ("black"); - if (n >= FW_BOLD) return intern ("bold"); + if (n >= FW_BOLD) return Qbold; if (n >= FW_SEMIBOLD) return intern ("demibold"); if (n >= FW_NORMAL) return intern ("medium"); - return intern ("light"); + return Qlight; } /* Fill in all the available details of LOGFONT from FONT_SPEC. */ diff --git a/src/w32inevt.c b/src/w32inevt.c index e09903f99be..ea2db26a60e 100644 --- a/src/w32inevt.c +++ b/src/w32inevt.c @@ -631,7 +631,7 @@ handle_file_notifications (struct input_event *hold_quit) if (notification_buffer_in_use) { DWORD info_size = notifications_size; - Lisp_Object cs = intern ("utf-16le"); + Lisp_Object cs = Qutf_16le; Lisp_Object obj = w32_get_watch_object (notifications_desc); /* notifications_size could be zero when the buffer of diff --git a/src/w32term.c b/src/w32term.c index a9ed2a852da..d415b13f715 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -3223,7 +3223,7 @@ queue_notifications (struct input_event *event, W32Msg *msg, struct frame *f, if (notification_buffer_in_use) { DWORD info_size = notifications_size; - Lisp_Object cs = intern ("utf-16le"); + Lisp_Object cs = Qutf_16le; Lisp_Object obj = w32_get_watch_object (notifications_desc); /* notifications_size could be zero when the buffer of -- 2.39.2