[Emacs-diffs] /srv/bzr/emacs/trunk r101706: Use intern_c_string instead of intern.

[Dan Nicolaescu]

------------------------------------------------------------
revno: 101706
committer: Dan Nicolaescu <address@hidden>
branch nick: trunk
timestamp: Fri 2010-10-01 05:25:21 -0700
message:
  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.
modified:
  src/ChangeLog
  src/charset.c
  src/image.c
  src/msdos.c
  src/nsfns.m
  src/nsmenu.m
  src/nsselect.m

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-10-01 12:19:52 +0000
+++ b/src/ChangeLog     2010-10-01 12:25:21 +0000
@@ -1,5 +1,12 @@
 2010-10-01  Dan Nicolaescu  <address@hidden>
 
+       * 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  <address@hidden>

=== modified file 'src/charset.c'
--- a/src/charset.c     2010-09-14 20:32:35 +0000
+++ b/src/charset.c     2010-10-01 12:25:21 +0000
@@ -2365,8 +2365,8 @@
   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);
   {

=== modified file 'src/image.c'
--- a/src/image.c       2010-09-25 12:04:35 +0000
+++ b/src/image.c       2010-10-01 12:25:21 +0000
@@ -8718,11 +8718,11 @@
   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 @@
 #endif
 
 #if defined (HAVE_IMAGEMAGICK)
-  Qimagemagick = intern ("imagemagick");
+  Qimagemagick = intern_c_string ("imagemagick");
   staticpro (&Qimagemagick);
   ADD_IMAGE_TYPE (Qimagemagick);
 #endif

=== modified file 'src/msdos.c'
--- a/src/msdos.c       2010-08-13 09:21:31 +0000
+++ b/src/msdos.c       2010-10-01 12:25:21 +0000
@@ -4706,7 +4706,7 @@
 #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,

=== modified file 'src/nsfns.m'
--- a/src/nsfns.m       2010-08-17 21:05:26 +0000
+++ b/src/nsfns.m       2010-10-01 12:25:21 +0000
@@ -2598,7 +2598,7 @@
 {
   int i;
 
-  Qfontsize = intern ("fontsize");
+  Qfontsize = intern_c_string ("fontsize");
   staticpro (&Qfontsize);
 
   DEFVAR_LISP ("ns-icon-type-alist", &Vns_icon_type_alist,

=== modified file 'src/nsmenu.m'
--- a/src/nsmenu.m      2010-08-11 12:34:46 +0000
+++ b/src/nsmenu.m      2010-10-01 12:25:21 +0000
@@ -1808,7 +1808,7 @@
   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);
 }
 

=== modified file 'src/nsselect.m'
--- a/src/nsselect.m    2010-08-19 05:55:30 +0000
+++ b/src/nsselect.m    2010-10-01 12:25:21 +0000
@@ -549,10 +549,10 @@
 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 @@
 \(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);
 }