Mercurial > emacs
diff src/nsselect.m @ 111572:b3f9490f0b7f
merge trunk
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Mon, 08 Nov 2010 14:19:24 +0900 |
| parents | 7e83565f8d0e |
| children | 417b1e4d63cd |
line wrap: on
line diff
--- a/src/nsselect.m Wed Sep 22 15:46:51 2010 +0900 +++ b/src/nsselect.m Mon Nov 08 14:19:24 2010 +0900 @@ -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); }