aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2015-02-21 14:54:08 +0200
committerEli Zaretskii2015-02-21 14:54:08 +0200
commit9074a684990600abd9dfad0477c7cd1d2f339ed3 (patch)
tree1a2a8c2b23be68ecf7959031b191c2de20a2d018 /src
parenta2e6668dee271ef76bede2c9556439df67999fda (diff)
downloademacs-9074a684990600abd9dfad0477c7cd1d2f339ed3.tar.gz
emacs-9074a684990600abd9dfad0477c7cd1d2f339ed3.zip
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")'.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog7
-rw-r--r--src/w32font.c8
-rw-r--r--src/w32inevt.c2
-rw-r--r--src/w32term.c2
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 @@
12015-02-21 Eli Zaretskii <eliz@gnu.org>
2
3 * w32term.c (queue_notifications):
4 * w32inevt.c (handle_file_notifications):
5 * w32font.c (w32_enumfont_pattern_entity): Prefer 'Qfoo' to
6 'intern ("foo")'.
7
12015-02-21 Paul Eggert <eggert@cs.ucla.edu> 82015-02-21 Paul Eggert <eggert@cs.ucla.edu>
2 9
3 Prefer 'Qfoo' to 'intern ("foo")' 10 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,
1072 truetype so that this information is not any worse than we could 1072 truetype so that this information is not any worse than we could
1073 have obtained later. */ 1073 have obtained later. */
1074 if (EQ (backend, Quniscribe) && (full_type & NTMFLAGS_OPENTYPE)) 1074 if (EQ (backend, Quniscribe) && (full_type & NTMFLAGS_OPENTYPE))
1075 tem = intern ("opentype"); 1075 tem = Qopentype;
1076 else if (font_type & TRUETYPE_FONTTYPE) 1076 else if (font_type & TRUETYPE_FONTTYPE)
1077 tem = intern ("truetype"); 1077 tem = intern ("truetype");
1078 else if (full_type & NTM_PS_OPENTYPE) 1078 else if (full_type & NTM_PS_OPENTYPE)
1079 tem = intern ("postscript"); 1079 tem = Qpostscript;
1080 else if (full_type & NTM_TYPE1) 1080 else if (full_type & NTM_TYPE1)
1081 tem = intern ("type1"); 1081 tem = intern ("type1");
1082 else if (font_type & RASTER_FONTTYPE) 1082 else if (font_type & RASTER_FONTTYPE)
@@ -1875,10 +1875,10 @@ static Lisp_Object
1875w32_to_fc_weight (int n) 1875w32_to_fc_weight (int n)
1876{ 1876{
1877 if (n >= FW_EXTRABOLD) return intern ("black"); 1877 if (n >= FW_EXTRABOLD) return intern ("black");
1878 if (n >= FW_BOLD) return intern ("bold"); 1878 if (n >= FW_BOLD) return Qbold;
1879 if (n >= FW_SEMIBOLD) return intern ("demibold"); 1879 if (n >= FW_SEMIBOLD) return intern ("demibold");
1880 if (n >= FW_NORMAL) return intern ("medium"); 1880 if (n >= FW_NORMAL) return intern ("medium");
1881 return intern ("light"); 1881 return Qlight;
1882} 1882}
1883 1883
1884/* Fill in all the available details of LOGFONT from FONT_SPEC. */ 1884/* 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)
631 if (notification_buffer_in_use) 631 if (notification_buffer_in_use)
632 { 632 {
633 DWORD info_size = notifications_size; 633 DWORD info_size = notifications_size;
634 Lisp_Object cs = intern ("utf-16le"); 634 Lisp_Object cs = Qutf_16le;
635 Lisp_Object obj = w32_get_watch_object (notifications_desc); 635 Lisp_Object obj = w32_get_watch_object (notifications_desc);
636 636
637 /* notifications_size could be zero when the buffer of 637 /* 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,
3223 if (notification_buffer_in_use) 3223 if (notification_buffer_in_use)
3224 { 3224 {
3225 DWORD info_size = notifications_size; 3225 DWORD info_size = notifications_size;
3226 Lisp_Object cs = intern ("utf-16le"); 3226 Lisp_Object cs = Qutf_16le;
3227 Lisp_Object obj = w32_get_watch_object (notifications_desc); 3227 Lisp_Object obj = w32_get_watch_object (notifications_desc);
3228 3228
3229 /* notifications_size could be zero when the buffer of 3229 /* notifications_size could be zero when the buffer of