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")'.

diff --git a/src/ChangeLog b/src/ChangeLog
index 1692c3f6f7052d18edcc4f0cdb01b3fb42005062..8604cfcb29fa8e30c4e901b5230965fe97dc6f32 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2015-02-21  Eli Zaretskii  <eliz@gnu.org>
+
+       * 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  <eggert@cs.ucla.edu>
 
        Prefer 'Qfoo' to 'intern ("foo")'

diff --git a/src/w32font.c b/src/w32font.c
index 360ad3f1c483cece884b5e40396fcaf55395a725..422f082e72b86fd69875445d581c4e3a8fa14a29 100644 (file)
--- 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 e09903f99be151f341092bc7ece035917af9238d..ea2db26a60ef4a2882b333799603ceb2eeeb8e32 100644 (file)
--- 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 a9ed2a852da0232420827a52d8f0a9ca0a29596d..d415b13f715ff77b092ab594f1b9283c75ca0334 100644 (file)
--- 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