From: Dan Nicolaescu <dann@ics.uci.edu>
Date: Fri, 1 Oct 2010 12:25:21 +0000 (-0700)
Subject: Use intern_c_string instead of intern.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~46^2~268
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=088dcc3e8c2a0b8a36dd9ac5e515d51e41530bee;p=emacs.git

Use intern_c_string instead of intern.
* src/nsselect.m (syms_of_nsselect):
* src/nsmenu.m (syms_of_nsmenu):
* src/nsfns.m (syms_of_nsfns):
* src/msdos.c (syms_of_msdos):
* src/image.c (syms_of_image):
* src/charset.c (syms_of_charset): Use intern_c_string instead of intern.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index cd25d7d88ec..753d262417a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,12 @@
 2010-10-01  Dan Nicolaescu  <dann@ics.uci.edu>
 
+	* nsselect.m (syms_of_nsselect):
+	* nsmenu.m (syms_of_nsmenu):
+	* nsfns.m (syms_of_nsfns):
+	* msdos.c (syms_of_msdos):
+	* image.c (syms_of_image):
+	* charset.c (syms_of_charset): Use intern_c_string instead of intern.
+
 	* point.h: Remove, unused.
 
 2010-10-01  Eli Zaretskii  <eliz@gnu.org>
diff --git a/src/charset.c b/src/charset.c
index 8051b11330e..43d1015a93d 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -2365,8 +2365,8 @@ syms_of_charset (void)
   Vemacs_mule_charset_list = Qnil;
 
   /* Don't staticpro them here.  It's done in syms_of_fns.  */
-  QCtest = intern (":test");
-  Qeq = intern ("eq");
+  QCtest = intern_c_string (":test");
+  Qeq = intern_c_string ("eq");
 
   staticpro (&Vcharset_hash_table);
   {
diff --git a/src/image.c b/src/image.c
index 940959e951a..72cbad987f6 100644
--- a/src/image.c
+++ b/src/image.c
@@ -8718,11 +8718,11 @@ non-numeric, there is no explicit limit on the size of images.  */);
   staticpro (&QCheuristic_mask);
   QCindex = intern_c_string (":index");
   staticpro (&QCindex);
-  QCgeometry = intern (":geometry");
+  QCgeometry = intern_c_string (":geometry");
   staticpro (&QCgeometry);
-  QCcrop = intern (":crop");
+  QCcrop = intern_c_string (":crop");
   staticpro (&QCcrop);
-  QCrotation = intern (":rotation");
+  QCrotation = intern_c_string (":rotation");
   staticpro (&QCrotation);
   QCmatrix = intern_c_string (":matrix");
   staticpro (&QCmatrix);
@@ -8785,7 +8785,7 @@ non-numeric, there is no explicit limit on the size of images.  */);
 #endif
 
 #if defined (HAVE_IMAGEMAGICK)
-  Qimagemagick = intern ("imagemagick");
+  Qimagemagick = intern_c_string ("imagemagick");
   staticpro (&Qimagemagick);
   ADD_IMAGE_TYPE (Qimagemagick);
 #endif
diff --git a/src/msdos.c b/src/msdos.c
index 086cad2ff84..3894770e194 100644
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -4706,7 +4706,7 @@ syms_of_msdos (void)
 #ifndef HAVE_X_WINDOWS
 
   /* The following two are from xfns.c:  */
-  Qreverse = intern ("reverse");
+  Qreverse = intern_c_string ("reverse");
   staticpro (&Qreverse);
 
   DEFVAR_LISP ("dos-unsupported-char-glyph", &Vdos_unsupported_char_glyph,
diff --git a/src/nsfns.m b/src/nsfns.m
index 576131e0bdf..db8bbeb5f76 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -2598,7 +2598,7 @@ syms_of_nsfns (void)
 {
   int i;
 
-  Qfontsize = intern ("fontsize");
+  Qfontsize = intern_c_string ("fontsize");
   staticpro (&Qfontsize);
 
   DEFVAR_LISP ("ns-icon-type-alist", &Vns_icon_type_alist,
diff --git a/src/nsmenu.m b/src/nsmenu.m
index 9534aec8f2b..d0276c50bf7 100644
--- a/src/nsmenu.m
+++ b/src/nsmenu.m
@@ -1808,7 +1808,7 @@ syms_of_nsmenu (void)
   defsubr (&Sns_reset_menu);
   defsubr (&Smenu_or_popup_active_p);
 
-  Qdebug_on_next_call = intern ("debug-on-next-call");
+  Qdebug_on_next_call = intern_c_string ("debug-on-next-call");
   staticpro (&Qdebug_on_next_call);
 }
 
diff --git a/src/nsselect.m b/src/nsselect.m
index 9e434515edf..786ca36069c 100644
--- a/src/nsselect.m
+++ b/src/nsselect.m
@@ -549,10 +549,10 @@ nxatoms_of_nsselect (void)
 void
 syms_of_nsselect (void)
 {
-  QCLIPBOARD = intern ("CLIPBOARD");	staticpro (&QCLIPBOARD);
-  QSECONDARY = intern ("SECONDARY");	staticpro (&QSECONDARY);
-  QTEXT      = intern ("TEXT"); 	staticpro (&QTEXT);
-  QFILE_NAME = intern ("FILE_NAME"); 	staticpro (&QFILE_NAME);
+  QCLIPBOARD = intern_c_string ("CLIPBOARD");	staticpro (&QCLIPBOARD);
+  QSECONDARY = intern_c_string ("SECONDARY");	staticpro (&QSECONDARY);
+  QTEXT      = intern_c_string ("TEXT"); 	staticpro (&QTEXT);
+  QFILE_NAME = intern_c_string ("FILE_NAME"); 	staticpro (&QFILE_NAME);
 
   defsubr (&Sx_disown_selection_internal);
   defsubr (&Sx_get_selection_internal);
@@ -605,7 +605,7 @@ The functions are called with one argument, the selection type\n\
 \(a symbol, typically `PRIMARY', `SECONDARY', or `CLIPBOARD').");
   Vns_lost_selection_hooks = Qnil;
 
-  Qforeign_selection = intern ("foreign-selection");
+  Qforeign_selection = intern_c_string ("foreign-selection");
   staticpro (&Qforeign_selection);
 }