Mercurial > emacs
changeset 110678:7e83565f8d0e
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.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Fri, 01 Oct 2010 05:25:21 -0700 |
| parents | 2b9572647fd0 |
| children | 400dd9dfdb7b |
| files | src/ChangeLog src/charset.c src/image.c src/msdos.c src/nsfns.m src/nsmenu.m src/nsselect.m |
| diffstat | 7 files changed, 21 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri Oct 01 05:19:52 2010 -0700 +++ b/src/ChangeLog Fri Oct 01 05:25:21 2010 -0700 @@ -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>
--- a/src/charset.c Fri Oct 01 05:19:52 2010 -0700 +++ b/src/charset.c Fri Oct 01 05:25:21 2010 -0700 @@ -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); {
--- a/src/image.c Fri Oct 01 05:19:52 2010 -0700 +++ b/src/image.c Fri Oct 01 05:25:21 2010 -0700 @@ -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
--- a/src/msdos.c Fri Oct 01 05:19:52 2010 -0700 +++ b/src/msdos.c Fri Oct 01 05:25:21 2010 -0700 @@ -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,
--- a/src/nsfns.m Fri Oct 01 05:19:52 2010 -0700 +++ b/src/nsfns.m Fri Oct 01 05:25:21 2010 -0700 @@ -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,
--- a/src/nsmenu.m Fri Oct 01 05:19:52 2010 -0700 +++ b/src/nsmenu.m Fri Oct 01 05:25:21 2010 -0700 @@ -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); }
--- a/src/nsselect.m Fri Oct 01 05:19:52 2010 -0700 +++ b/src/nsselect.m Fri Oct 01 05:25:21 2010 -0700 @@ -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); }