aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPo Lu2024-05-09 14:58:45 +0800
committerPo Lu2024-05-09 15:07:22 +0800
commit67ab6bcdbac572a6266d7c9d15833bd2ddd049fa (patch)
tree3469eaa3f625da33e3c5c5e0e91cc5c202552c81 /src
parent9b7dd30807ed4be9afe4f66cfa5130aa7d178989 (diff)
downloademacs-67ab6bcdbac572a6266d7c9d15833bd2ddd049fa.tar.gz
emacs-67ab6bcdbac572a6266d7c9d15833bd2ddd049fa.zip
Replace calls to intern with a constant string with DEFSYMs
* src/alloc.c (display_malloc_warning, syms_of_alloc): * src/buffer.c (Fmake_indirect_buffer, Fbuffer_local_variables) (Frename_buffer, Fkill_buffer, Fset_buffer_major_mode) (Fset_buffer_multibyte, syms_of_buffer): * src/callint.c (read_file_name, Fcall_interactively) (syms_of_callint): * src/callproc.c (call_process, create_temp_file) (syms_of_callproc): * src/charset.c (Fdefine_charset_internal, syms_of_charset): * src/cmds.c (internal_self_insert, syms_of_cmds): * src/coding.c (record_conversion_result) (Fdefine_coding_system_internal, syms_of_coding): * src/dbusbind.c (xd_signature, Fdbus_message_internal) (syms_of_dbusbind): * src/dispnew.c (init_faces_initial): * src/doc.c (Fsnarf_documentation, syms_of_doc): * src/dosfns.c (system_process_attributes, syms_of_dosfns): * src/emacs.c (init_cmdargs, Fdump_emacs, decode_env_path) (syms_of_emacs): * src/eval.c (call_debugger, Fdefvaralias, syms_of_eval): * src/fileio.c (barf_or_query_if_file_exists) (Finsert_file_contents, auto_save_error, Fdo_auto_save) (syms_of_fileio): * src/filelock.c (lock_file_1, syms_of_filelock): * src/fontset.c (fontset_from_font, syms_of_fontset): * src/frame.c (make_frame_without_minibuffer, syms_of_frame): * src/gnutls.c (emacs_gnutls_certificate_details) (Fgnutls_peer_status_warning_describe, Fgnutls_peer_status) (gnutls_verify_boot, syms_of_gnutls): * src/gtkutil.c (style_changed_cb, find_rtl_image): * src/image.c (imagemagick_filename_hint, gs_load) (syms_of_image): * src/keyboard.c (command_loop_1, read_char, timer_start_idle) (read_char_minibuf_menu_prompt, Fsuspend_emacs) (syms_of_keyboard): * src/keymap.c (Fmap_keymap, Flookup_key, Fdescribe_vector) (describe_vector, syms_of_keymap): * src/lread.c (Fread, Fread_positioning_symbols, syms_of_lread): * src/minibuf.c (Fabort_minibuffers, Fread_buffer) (Fcompleting_read, syms_of_minibuf): * src/msdos.c (XMenuActivate, run_msdos_command, syms_of_msdos): * src/nsfns.m (Fx_display_backing_store, Fx_display_visual_class) (Fns_hide_emacs, Fsystem_move_file_to_trash, ns_create_tip_frame) (x_hide_tip, Fx_show_tip, syms_of_nsfns): * src/nsfont.m (ns_spec_to_descriptor, ns_descriptor_to_entity) (syms_of_nsfont): * src/pdumper.c (Fdump_emacs_portable): * src/pgtkfns.c (Fx_display_visual_class, x_create_tip_frame) (Fx_show_tip, syms_of_pgtkfns): * src/pgtkterm.c (syms_of_pgtkterm, pgtk_cr_export_frames): * src/term.c (term_get_fkeys_1, set_tty_color_mode, Fsuspend_tty) (Fresume_tty, tty_menu_activate, syms_of_term): * src/terminal.c (create_terminal, syms_of_terminal): * src/w32fns.c (Fx_display_backing_store) (Fx_display_visual_class, Fset_message_beep, Fx_open_connection) (Fx_show_tip, Fx_file_dialog, Fsystem_move_file_to_trash) (Fw32_toggle_lock_key, syms_of_w32fns): * src/w32font.c (w32_enumfont_pattern_entity, syms_of_w32font): * src/w32term.c (w32_bitmap_icon, syms_of_w32term): * src/xdisp.c (message_dolog, define_frame_cursor1) (syms_of_xdisp): * src/xfaces.c (tty_lookup_color, syms_of_xfaces): * src/xml.c (make_dom, syms_of_xml): * src/xterm.c (syms_of_xterm): * src/xwidget.c (store_xwidget_download_callback_event) (store_xwidget_js_callback_event, syms_of_xwidget): Define symbols for symbols interned with `intern' from a constant string, delete duplicate DEFSYM directives, and substitute them for such calls to intern. This excludes only those symbols which are interned and referenced only once during Emacs's initialization, the timing of whose interning is inconsequential, and symbols in w32.c, which would need to be transferred to a new syms_of_w32 function that I cannot test.
Diffstat (limited to 'src')
-rw-r--r--src/alloc.c8
-rw-r--r--src/buffer.c25
-rw-r--r--src/callint.c13
-rw-r--r--src/callproc.c8
-rw-r--r--src/charset.c3
-rw-r--r--src/cmds.c3
-rw-r--r--src/coding.c7
-rw-r--r--src/dbusbind.c18
-rw-r--r--src/dispnew.c2
-rw-r--r--src/doc.c5
-rw-r--r--src/dosfns.c3
-rw-r--r--src/emacs.c12
-rw-r--r--src/eval.c9
-rw-r--r--src/fileio.c18
-rw-r--r--src/filelock.c3
-rw-r--r--src/fontset.c3
-rw-r--r--src/frame.c9
-rw-r--r--src/gnutls.c162
-rw-r--r--src/gtkutil.c7
-rw-r--r--src/image.c12
-rw-r--r--src/keyboard.c25
-rw-r--r--src/keymap.c12
-rw-r--r--src/lread.c5
-rw-r--r--src/minibuf.c12
-rw-r--r--src/msdos.c13
-rw-r--r--src/nsfns.m58
-rw-r--r--src/nsfont.m14
-rw-r--r--src/pdumper.c2
-rw-r--r--src/pgtkfns.c11
-rw-r--r--src/pgtkterm.c6
-rw-r--r--src/term.c22
-rw-r--r--src/terminal.c9
-rw-r--r--src/w32fns.c71
-rw-r--r--src/w32font.c14
-rw-r--r--src/w32term.c16
-rw-r--r--src/xdisp.c19
-rw-r--r--src/xfaces.c3
-rw-r--r--src/xml.c4
-rw-r--r--src/xterm.c7
-rw-r--r--src/xwidget.c6
40 files changed, 419 insertions, 240 deletions
diff --git a/src/alloc.c b/src/alloc.c
index 47a8e4f4bd2..4226cb1d1a0 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -668,10 +668,10 @@ malloc_warning (const char *str)
668void 668void
669display_malloc_warning (void) 669display_malloc_warning (void)
670{ 670{
671 call3 (intern ("display-warning"), 671 call3 (Qdisplay_warning,
672 intern ("alloc"), 672 Qalloc,
673 build_string (pending_malloc_warning), 673 build_string (pending_malloc_warning),
674 intern (":emergency")); 674 QCemergency);
675 pending_malloc_warning = 0; 675 pending_malloc_warning = 0;
676} 676}
677 677
@@ -8317,6 +8317,8 @@ N should be nonnegative. */);
8317 4, 4, "watch_gc_cons_percentage", {0}, lisp_h_Qnil}}; 8317 4, 4, "watch_gc_cons_percentage", {0}, lisp_h_Qnil}};
8318 XSETSUBR (watcher, &Swatch_gc_cons_percentage.s); 8318 XSETSUBR (watcher, &Swatch_gc_cons_percentage.s);
8319 Fadd_variable_watcher (Qgc_cons_percentage, watcher); 8319 Fadd_variable_watcher (Qgc_cons_percentage, watcher);
8320 DEFSYM (Qalloc, "alloc");
8321 DEFSYM (QCemergency, ":emergency");
8320} 8322}
8321 8323
8322#ifdef HAVE_X_WINDOWS 8324#ifdef HAVE_X_WINDOWS
diff --git a/src/buffer.c b/src/buffer.c
index 291c7d3f911..8f983692124 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -931,8 +931,8 @@ Interactively, CLONE and INHIBIT-BUFFER-HOOKS are nil. */)
931 bset_local_minor_modes (b, Qnil); 931 bset_local_minor_modes (b, Qnil);
932 bset_auto_save_file_name (b, Qnil); 932 bset_auto_save_file_name (b, Qnil);
933 set_buffer_internal_1 (b); 933 set_buffer_internal_1 (b);
934 Fset (intern ("buffer-save-without-query"), Qnil); 934 Fset (Qbuffer_save_without_query, Qnil);
935 Fset (intern ("buffer-file-number"), Qnil); 935 Fset (Qbuffer_file_number, Qnil);
936 if (!NILP (Flocal_variable_p (Qbuffer_stale_function, base_buffer))) 936 if (!NILP (Flocal_variable_p (Qbuffer_stale_function, base_buffer)))
937 Fkill_local_variable (Qbuffer_stale_function); 937 Fkill_local_variable (Qbuffer_stale_function);
938 /* Cloned buffers need extra setup, to do things such as deep 938 /* Cloned buffers need extra setup, to do things such as deep
@@ -1477,7 +1477,7 @@ No argument or nil as argument means use current buffer as BUFFER. */)
1477 } 1477 }
1478 1478
1479 tem = buffer_local_variables_1 (buf, PER_BUFFER_VAR_OFFSET (undo_list), 1479 tem = buffer_local_variables_1 (buf, PER_BUFFER_VAR_OFFSET (undo_list),
1480 intern ("buffer-undo-list")); 1480 Qbuffer_undo_list);
1481 if (!NILP (tem)) 1481 if (!NILP (tem))
1482 result = Fcons (tem, result); 1482 result = Fcons (tem, result);
1483 1483
@@ -1704,11 +1704,11 @@ This does not change the name of the visited file (if any). */)
1704 Fsetcar (Frassq (buf, Vbuffer_alist), newname); 1704 Fsetcar (Frassq (buf, Vbuffer_alist), newname);
1705 if (NILP (BVAR (current_buffer, filename)) 1705 if (NILP (BVAR (current_buffer, filename))
1706 && !NILP (BVAR (current_buffer, auto_save_file_name))) 1706 && !NILP (BVAR (current_buffer, auto_save_file_name)))
1707 call0 (intern ("rename-auto-save-file")); 1707 call0 (Qrename_auto_save_file);
1708 1708
1709 run_buffer_list_update_hook (current_buffer); 1709 run_buffer_list_update_hook (current_buffer);
1710 1710
1711 call2 (intern ("uniquify--rename-buffer-advice"), 1711 call2 (Quniquify__rename_buffer_advice,
1712 requestedname, unique); 1712 requestedname, unique);
1713 1713
1714 /* Refetch since that last call may have done GC. */ 1714 /* Refetch since that last call may have done GC. */
@@ -1956,7 +1956,7 @@ cleaning up all windows currently displaying the buffer to be killed. */)
1956 { 1956 {
1957 tem = do_yes_or_no_p (build_string ("Delete auto-save file? ")); 1957 tem = do_yes_or_no_p (build_string ("Delete auto-save file? "));
1958 if (!NILP (tem)) 1958 if (!NILP (tem))
1959 call0 (intern ("delete-auto-save-file-if-necessary")); 1959 call0 (Qdelete_auto_save_file_if_necessary);
1960 } 1960 }
1961 1961
1962 /* If the hooks have killed the buffer, exit now. */ 1962 /* If the hooks have killed the buffer, exit now. */
@@ -2251,7 +2251,7 @@ the current buffer's major mode. */)
2251 error ("Attempt to set major mode for a dead buffer"); 2251 error ("Attempt to set major mode for a dead buffer");
2252 2252
2253 if (strcmp (SSDATA (BVAR (XBUFFER (buffer), name)), "*scratch*") == 0) 2253 if (strcmp (SSDATA (BVAR (XBUFFER (buffer), name)), "*scratch*") == 0)
2254 function = find_symbol_value (intern ("initial-major-mode")); 2254 function = find_symbol_value (Qinitial_major_mode);
2255 else 2255 else
2256 { 2256 {
2257 function = BVAR (&buffer_defaults, major_mode); 2257 function = BVAR (&buffer_defaults, major_mode);
@@ -2936,7 +2936,7 @@ current buffer is cleared. */)
2936 /* Represent all the above changes by a special undo entry. */ 2936 /* Represent all the above changes by a special undo entry. */
2937 bset_undo_list (current_buffer, 2937 bset_undo_list (current_buffer,
2938 Fcons (list3 (Qapply, 2938 Fcons (list3 (Qapply,
2939 intern ("set-buffer-multibyte"), 2939 Qset_buffer_multibyte,
2940 NILP (flag) ? Qt : Qnil), 2940 NILP (flag) ? Qt : Qnil),
2941 old_undo)); 2941 old_undo));
2942 } 2942 }
@@ -6112,4 +6112,13 @@ There is no reason to change that value except for debugging purposes. */);
6112 DEFSYM (Qbuffer_stale_function, "buffer-stale-function"); 6112 DEFSYM (Qbuffer_stale_function, "buffer-stale-function");
6113 6113
6114 Fput (intern_c_string ("erase-buffer"), Qdisabled, Qt); 6114 Fput (intern_c_string ("erase-buffer"), Qdisabled, Qt);
6115
6116 DEFSYM (Qbuffer_save_without_query, "buffer-save-without-query");
6117 DEFSYM (Qbuffer_file_number, "buffer-file-number");
6118 DEFSYM (Qbuffer_undo_list, "buffer-undo-list");
6119 DEFSYM (Qrename_auto_save_file, "rename-auto-save-file");
6120 DEFSYM (Quniquify__rename_buffer_advice, "uniquify--rename-buffer-advice");
6121 DEFSYM (Qdelete_auto_save_file_if_necessary, "delete-auto-save-file-if-necessary");
6122 DEFSYM (Qinitial_major_mode, "initial-major-mode");
6123 DEFSYM (Qset_buffer_multibyte, "set-buffer-multibyte");
6115} 6124}
diff --git a/src/callint.c b/src/callint.c
index 9d6f2ab2888..1af9666e5a4 100644
--- a/src/callint.c
+++ b/src/callint.c
@@ -228,7 +228,7 @@ static Lisp_Object
228read_file_name (Lisp_Object default_filename, Lisp_Object mustmatch, 228read_file_name (Lisp_Object default_filename, Lisp_Object mustmatch,
229 Lisp_Object initial, Lisp_Object predicate) 229 Lisp_Object initial, Lisp_Object predicate)
230{ 230{
231 return CALLN (Ffuncall, intern ("read-file-name"), 231 return CALLN (Ffuncall, Qread_file_name,
232 callint_message, Qnil, default_filename, 232 callint_message, Qnil, default_filename,
233 mustmatch, initial, predicate); 233 mustmatch, initial, predicate);
234} 234}
@@ -330,7 +330,7 @@ invoke it (via an `interactive' spec that contains, for instance, an
330 and turn them into things we can eval. */ 330 and turn them into things we can eval. */
331 Lisp_Object values = quotify_args (Fcopy_sequence (specs)); 331 Lisp_Object values = quotify_args (Fcopy_sequence (specs));
332 fix_command (function, values); 332 fix_command (function, values);
333 call4 (intern ("add-to-history"), intern ("command-history"), 333 call4 (Qadd_to_history, Qcommand_history,
334 Fcons (function, values), Qnil, Qt); 334 Fcons (function, values), Qnil, Qt);
335 } 335 }
336 336
@@ -687,12 +687,12 @@ invoke it (via an `interactive' spec that contains, for instance, an
687 break; 687 break;
688 688
689 case 'x': /* Lisp expression read but not evaluated. */ 689 case 'x': /* Lisp expression read but not evaluated. */
690 args[i] = call1 (intern ("read-minibuffer"), callint_message); 690 args[i] = call1 (Qread_minibuffer, callint_message);
691 visargs[i] = last_minibuf_string; 691 visargs[i] = last_minibuf_string;
692 break; 692 break;
693 693
694 case 'X': /* Lisp expression read and evaluated. */ 694 case 'X': /* Lisp expression read and evaluated. */
695 args[i] = call1 (intern ("eval-minibuffer"), callint_message); 695 args[i] = call1 (Qeval_minibuffer, callint_message);
696 visargs[i] = last_minibuf_string; 696 visargs[i] = last_minibuf_string;
697 break; 697 break;
698 698
@@ -766,7 +766,7 @@ invoke it (via an `interactive' spec that contains, for instance, an
766 visargs[i] = (varies[i] > 0 766 visargs[i] = (varies[i] > 0
767 ? list1 (intern (callint_argfuns[varies[i]])) 767 ? list1 (intern (callint_argfuns[varies[i]]))
768 : quotify_arg (args[i])); 768 : quotify_arg (args[i]));
769 call4 (intern ("add-to-history"), intern ("command-history"), 769 call4 (Qadd_to_history, Qcommand_history,
770 Flist (nargs - 1, visargs + 1), Qnil, Qt); 770 Flist (nargs - 1, visargs + 1), Qnil, Qt);
771 } 771 }
772 772
@@ -912,4 +912,7 @@ use `event-start', `event-end', and `event-click-count'. */);
912 defsubr (&Sprefix_numeric_value); 912 defsubr (&Sprefix_numeric_value);
913 913
914 DEFSYM (Qinteractive_args, "interactive-args"); 914 DEFSYM (Qinteractive_args, "interactive-args");
915 DEFSYM (Qread_file_name, "read-file-name");
916 DEFSYM (Qcommand_history, "command-history");
917 DEFSYM (Qeval_minibuffer, "eval-minibuffer");
915} 918}
diff --git a/src/callproc.c b/src/callproc.c
index db36ef569e6..e116298baef 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -914,7 +914,7 @@ call_process (ptrdiff_t nargs, Lisp_Object *args, int filefd,
914 /* If the caller required, let the buffer inherit the 914 /* If the caller required, let the buffer inherit the
915 coding-system used to decode the process output. */ 915 coding-system used to decode the process output. */
916 if (inherit_process_coding_system) 916 if (inherit_process_coding_system)
917 call1 (intern ("after-insert-file-set-buffer-file-coding-system"), 917 call1 (Qafter_insert_file_set_buffer_file_coding_system,
918 make_fixnum (total_read)); 918 make_fixnum (total_read));
919 } 919 }
920 920
@@ -1041,7 +1041,7 @@ create_temp_file (ptrdiff_t nargs, Lisp_Object *args,
1041 { 1041 {
1042 specpdl_ref count1 = SPECPDL_INDEX (); 1042 specpdl_ref count1 = SPECPDL_INDEX ();
1043 1043
1044 specbind (intern ("coding-system-for-write"), val); 1044 specbind (Qcoding_system_for_write, val);
1045 /* POSIX lets mk[s]temp use "."; don't invoke jka-compr if we 1045 /* POSIX lets mk[s]temp use "."; don't invoke jka-compr if we
1046 happen to get a ".Z" suffix. */ 1046 happen to get a ".Z" suffix. */
1047 specbind (Qfile_name_handler_alist, Qnil); 1047 specbind (Qfile_name_handler_alist, Qnil);
@@ -2246,4 +2246,8 @@ the system. */);
2246 defsubr (&Scall_process); 2246 defsubr (&Scall_process);
2247 defsubr (&Sgetenv_internal); 2247 defsubr (&Sgetenv_internal);
2248 defsubr (&Scall_process_region); 2248 defsubr (&Scall_process_region);
2249
2250 DEFSYM (Qafter_insert_file_set_buffer_file_coding_system,
2251 "after-insert-file-set-buffer-file-coding-system");
2252 DEFSYM (Qcoding_system_for_write, "coding-system-for-write");
2249} 2253}
diff --git a/src/charset.c b/src/charset.c
index 4bacc011e85..675097c6843 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -862,7 +862,7 @@ usage: (define-charset-internal ...) */)
862 862
863 if (nargs != charset_arg_max) 863 if (nargs != charset_arg_max)
864 Fsignal (Qwrong_number_of_arguments, 864 Fsignal (Qwrong_number_of_arguments,
865 Fcons (intern ("define-charset-internal"), 865 Fcons (Qdefine_charset_internal,
866 make_fixnum (nargs))); 866 make_fixnum (nargs)));
867 867
868 attrs = make_nil_vector (charset_attr_max); 868 attrs = make_nil_vector (charset_attr_max);
@@ -2354,6 +2354,7 @@ void
2354syms_of_charset (void) 2354syms_of_charset (void)
2355{ 2355{
2356 DEFSYM (Qcharsetp, "charsetp"); 2356 DEFSYM (Qcharsetp, "charsetp");
2357 DEFSYM (Qdefine_charset_internal, "define-charset-internal");
2357 2358
2358 /* Special charset symbols. */ 2359 /* Special charset symbols. */
2359 DEFSYM (Qascii, "ascii"); 2360 DEFSYM (Qascii, "ascii");
diff --git a/src/cmds.c b/src/cmds.c
index 81788b07242..f7a3f9e7ac6 100644
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -428,7 +428,7 @@ internal_self_insert (int c, EMACS_INT n)
428 && SYMBOLP (XSYMBOL (sym)->u.s.function)) 428 && SYMBOLP (XSYMBOL (sym)->u.s.function))
429 { 429 {
430 Lisp_Object prop; 430 Lisp_Object prop;
431 prop = Fget (XSYMBOL (sym)->u.s.function, intern ("no-self-insert")); 431 prop = Fget (XSYMBOL (sym)->u.s.function, Qno_self_insert);
432 if (! NILP (prop)) 432 if (! NILP (prop))
433 return 1; 433 return 1;
434 } 434 }
@@ -507,6 +507,7 @@ syms_of_cmds (void)
507 DEFSYM (Qundo_auto_amalgamate, "undo-auto-amalgamate"); 507 DEFSYM (Qundo_auto_amalgamate, "undo-auto-amalgamate");
508 DEFSYM (Qundo_auto__this_command_amalgamating, 508 DEFSYM (Qundo_auto__this_command_amalgamating,
509 "undo-auto--this-command-amalgamating"); 509 "undo-auto--this-command-amalgamating");
510 DEFSYM (Qno_self_insert, "no-self-insert");
510 511
511 DEFSYM (Qkill_forward_chars, "kill-forward-chars"); 512 DEFSYM (Qkill_forward_chars, "kill-forward-chars");
512 513
diff --git a/src/coding.c b/src/coding.c
index b21f2ecf00a..5e4e92ea6e2 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -806,7 +806,7 @@ record_conversion_result (struct coding_system *coding,
806 case CODING_RESULT_SUCCESS: 806 case CODING_RESULT_SUCCESS:
807 break; 807 break;
808 default: 808 default:
809 Vlast_code_conversion_error = intern ("Unknown error"); 809 Vlast_code_conversion_error = QUnknown_error;
810 } 810 }
811} 811}
812 812
@@ -11508,7 +11508,7 @@ usage: (define-coding-system-internal ...) */)
11508 11508
11509 short_args: 11509 short_args:
11510 Fsignal (Qwrong_number_of_arguments, 11510 Fsignal (Qwrong_number_of_arguments,
11511 Fcons (intern ("define-coding-system-internal"), 11511 Fcons (Qdefine_coding_system_internal,
11512 make_fixnum (nargs))); 11512 make_fixnum (nargs)));
11513} 11513}
11514 11514
@@ -12291,6 +12291,9 @@ internal character representation. */);
12291 Fset (AREF (Vcoding_category_table, i), Qno_conversion); 12291 Fset (AREF (Vcoding_category_table, i), Qno_conversion);
12292 12292
12293 pdumper_do_now_and_after_load (reset_coding_after_pdumper_load); 12293 pdumper_do_now_and_after_load (reset_coding_after_pdumper_load);
12294
12295 DEFSYM (QUnknown_error, "Unknown error");
12296 DEFSYM (Qdefine_coding_system_internal, "define-coding-system-internal");
12294} 12297}
12295 12298
12296static void 12299static void
diff --git a/src/dbusbind.c b/src/dbusbind.c
index 0441b07a3b2..9f93f2894c2 100644
--- a/src/dbusbind.c
+++ b/src/dbusbind.c
@@ -474,7 +474,7 @@ xd_signature (char *signature, int dtype, int parent_type, Lisp_Object object)
474 subtype = XD_OBJECT_TO_DBUS_TYPE (CAR_SAFE (elt)); 474 subtype = XD_OBJECT_TO_DBUS_TYPE (CAR_SAFE (elt));
475 xd_signature (x, subtype, dtype, CAR_SAFE (XD_NEXT_VALUE (elt))); 475 xd_signature (x, subtype, dtype, CAR_SAFE (XD_NEXT_VALUE (elt)));
476 if (strcmp (subsig, x) != 0) 476 if (strcmp (subsig, x) != 0)
477 wrong_type_argument (intern ("D-Bus"), CAR_SAFE (elt)); 477 wrong_type_argument (QD_Bus, CAR_SAFE (elt));
478 elt = CDR_SAFE (XD_NEXT_VALUE (elt)); 478 elt = CDR_SAFE (XD_NEXT_VALUE (elt));
479 } 479 }
480 480
@@ -493,7 +493,7 @@ xd_signature (char *signature, int dtype, int parent_type, Lisp_Object object)
493 xd_signature (x, subtype, dtype, CAR_SAFE (XD_NEXT_VALUE (elt))); 493 xd_signature (x, subtype, dtype, CAR_SAFE (XD_NEXT_VALUE (elt)));
494 494
495 if (!NILP (CDR_SAFE (XD_NEXT_VALUE (elt)))) 495 if (!NILP (CDR_SAFE (XD_NEXT_VALUE (elt))))
496 wrong_type_argument (intern ("D-Bus"), 496 wrong_type_argument (QD_Bus,
497 CAR_SAFE (CDR_SAFE (XD_NEXT_VALUE (elt)))); 497 CAR_SAFE (CDR_SAFE (XD_NEXT_VALUE (elt))));
498 498
499 sprintf (signature, "%c", dtype); 499 sprintf (signature, "%c", dtype);
@@ -528,7 +528,7 @@ xd_signature (char *signature, int dtype, int parent_type, Lisp_Object object)
528 528
529 /* Check the parent object type. */ 529 /* Check the parent object type. */
530 if (parent_type != DBUS_TYPE_ARRAY) 530 if (parent_type != DBUS_TYPE_ARRAY)
531 wrong_type_argument (intern ("D-Bus"), object); 531 wrong_type_argument (QD_Bus, object);
532 532
533 /* Compose the signature from the elements. It is enclosed by 533 /* Compose the signature from the elements. It is enclosed by
534 curly braces. */ 534 curly braces. */
@@ -542,7 +542,7 @@ xd_signature (char *signature, int dtype, int parent_type, Lisp_Object object)
542 xd_signature_cat (signature, x); 542 xd_signature_cat (signature, x);
543 543
544 if (!XD_BASIC_DBUS_TYPE (subtype)) 544 if (!XD_BASIC_DBUS_TYPE (subtype))
545 wrong_type_argument (intern ("D-Bus"), CAR_SAFE (XD_NEXT_VALUE (elt))); 545 wrong_type_argument (QD_Bus, CAR_SAFE (XD_NEXT_VALUE (elt)));
546 546
547 /* Second element. */ 547 /* Second element. */
548 elt = CDR_SAFE (XD_NEXT_VALUE (elt)); 548 elt = CDR_SAFE (XD_NEXT_VALUE (elt));
@@ -552,7 +552,7 @@ xd_signature (char *signature, int dtype, int parent_type, Lisp_Object object)
552 xd_signature_cat (signature, x); 552 xd_signature_cat (signature, x);
553 553
554 if (!NILP (CDR_SAFE (XD_NEXT_VALUE (elt)))) 554 if (!NILP (CDR_SAFE (XD_NEXT_VALUE (elt))))
555 wrong_type_argument (intern ("D-Bus"), 555 wrong_type_argument (QD_Bus,
556 CAR_SAFE (CDR_SAFE (XD_NEXT_VALUE (elt)))); 556 CAR_SAFE (CDR_SAFE (XD_NEXT_VALUE (elt))));
557 557
558 /* Closing signature. */ 558 /* Closing signature. */
@@ -560,7 +560,7 @@ xd_signature (char *signature, int dtype, int parent_type, Lisp_Object object)
560 break; 560 break;
561 561
562 default: 562 default:
563 wrong_type_argument (intern ("D-Bus"), object); 563 wrong_type_argument (QD_Bus, object);
564 } 564 }
565 565
566 XD_DEBUG_MESSAGE ("%s", signature); 566 XD_DEBUG_MESSAGE ("%s", signature);
@@ -1480,7 +1480,7 @@ usage: (dbus-message-internal &rest REST) */)
1480 bus or an unknown name, we regard it as broadcast message 1480 bus or an unknown name, we regard it as broadcast message
1481 due to backward compatibility. */ 1481 due to backward compatibility. */
1482 if (dbus_bus_name_has_owner (connection, SSDATA (service), NULL)) 1482 if (dbus_bus_name_has_owner (connection, SSDATA (service), NULL))
1483 uname = call2 (intern ("dbus-get-name-owner"), bus, service); 1483 uname = call2 (Qdbus_get_name_owner, bus, service);
1484 else 1484 else
1485 uname = Qnil; 1485 uname = Qnil;
1486 1486
@@ -1886,6 +1886,7 @@ syms_of_dbusbind (void)
1886 list2 (Qdbus_error, Qerror)); 1886 list2 (Qdbus_error, Qerror));
1887 Fput (Qdbus_error, Qerror_message, 1887 Fput (Qdbus_error, Qerror_message,
1888 build_pure_c_string ("D-Bus error")); 1888 build_pure_c_string ("D-Bus error"));
1889 DEFSYM (QD_Bus, "D-Bus");
1889 1890
1890 /* Lisp symbols of the system and session buses. */ 1891 /* Lisp symbols of the system and session buses. */
1891 DEFSYM (QCsystem, ":system"); 1892 DEFSYM (QCsystem, ":system");
@@ -1924,6 +1925,9 @@ syms_of_dbusbind (void)
1924 DEFSYM (QCsignal, ":signal"); 1925 DEFSYM (QCsignal, ":signal");
1925 DEFSYM (QCmonitor, ":monitor"); 1926 DEFSYM (QCmonitor, ":monitor");
1926 1927
1928 /* Miscellaneous Lisp symbols. */
1929 DEFSYM (Qdbus_get_name_owner, "dbus-get-name-owner");
1930
1927 DEFVAR_LISP ("dbus-compiled-version", 1931 DEFVAR_LISP ("dbus-compiled-version",
1928 Vdbus_compiled_version, 1932 Vdbus_compiled_version,
1929 doc: /* The version of D-Bus Emacs is compiled against. */); 1933 doc: /* The version of D-Bus Emacs is compiled against. */);
diff --git a/src/dispnew.c b/src/dispnew.c
index c204a9dbf1b..8eda8dbb358 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -6503,7 +6503,7 @@ init_faces_initial (void)
6503 6503
6504 FRAME_FOREGROUND_PIXEL (sf) = FACE_TTY_DEFAULT_FG_COLOR; 6504 FRAME_FOREGROUND_PIXEL (sf) = FACE_TTY_DEFAULT_FG_COLOR;
6505 FRAME_BACKGROUND_PIXEL (sf) = FACE_TTY_DEFAULT_BG_COLOR; 6505 FRAME_BACKGROUND_PIXEL (sf) = FACE_TTY_DEFAULT_BG_COLOR;
6506 call0 (intern ("tty-set-up-initial-frame-faces")); 6506 call0 (Qtty_set_up_initial_frame_faces);
6507} 6507}
6508 6508
6509/* Initialization done when Emacs fork is started, before doing stty. 6509/* Initialization done when Emacs fork is started, before doing stty.
diff --git a/src/doc.c b/src/doc.c
index b698591f704..36633a920c6 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -564,8 +564,8 @@ the same file name is found in the `doc-directory'. */)
564 ptrdiff_t dirlen; 564 ptrdiff_t dirlen;
565 /* Preloaded defcustoms using custom-initialize-delay are added to 565 /* Preloaded defcustoms using custom-initialize-delay are added to
566 this list, but kept unbound. See https://debbugs.gnu.org/11565 */ 566 this list, but kept unbound. See https://debbugs.gnu.org/11565 */
567 Lisp_Object delayed_init = 567 Lisp_Object delayed_init
568 find_symbol_value (intern ("custom-delayed-init-variables")); 568 = find_symbol_value (Qcustom_delayed_init_variables);
569 569
570 if (!CONSP (delayed_init)) delayed_init = Qnil; 570 if (!CONSP (delayed_init)) delayed_init = Qnil;
571 571
@@ -779,4 +779,5 @@ compute the correct value for the current terminal in the nil case. */);
779 defsubr (&Sdocumentation_property); 779 defsubr (&Sdocumentation_property);
780 defsubr (&Ssnarf_documentation); 780 defsubr (&Ssnarf_documentation);
781 defsubr (&Stext_quoting_style); 781 defsubr (&Stext_quoting_style);
782 DEFSYM (Qcustom_delayed_init_variables, "custom-delayed-init-variables");
782} 783}
diff --git a/src/dosfns.c b/src/dosfns.c
index 96087116c19..f883c7a8b8a 100644
--- a/src/dosfns.c
+++ b/src/dosfns.c
@@ -563,7 +563,7 @@ system_process_attributes (Lisp_Object pid)
563 attrs = Fcons (Fcons (Qtime, tem), attrs); 563 attrs = Fcons (Fcons (Qtime, tem), attrs);
564 attrs = Fcons (Fcons (Qthcount, make_fixnum (1)), attrs); 564 attrs = Fcons (Fcons (Qthcount, make_fixnum (1)), attrs);
565 attrs = Fcons (Fcons (Qstart, 565 attrs = Fcons (Fcons (Qstart,
566 Fsymbol_value (intern ("before-init-time"))), 566 Fsymbol_value (Qbefore_init_time)),
567 attrs); 567 attrs);
568 attrs = Fcons (Fcons (Qvsize, 568 attrs = Fcons (Fcons (Qvsize,
569 INT_TO_INTEGER ((unsigned long) sbrk (0) / 1024)), 569 INT_TO_INTEGER ((unsigned long) sbrk (0) / 1024)),
@@ -794,5 +794,6 @@ If non-zero, this variable contains the character to be returned when the
794decimal point key in the numeric keypad is pressed when Num Lock is on. 794decimal point key in the numeric keypad is pressed when Num Lock is on.
795If zero, the decimal point key returns the country code specific value. */); 795If zero, the decimal point key returns the country code specific value. */);
796 dos_decimal_point = 0; 796 dos_decimal_point = 0;
797 DEFSYM (Qbefore_init_time, "before-init-time");
797} 798}
798#endif /* MSDOS */ 799#endif /* MSDOS */
diff --git a/src/emacs.c b/src/emacs.c
index 77e6c41e822..22da39a4d1c 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -565,9 +565,8 @@ init_cmdargs (int argc, char **argv, int skip_args, char const *original_pwd)
565 { 565 {
566 if (NILP (Vpurify_flag)) 566 if (NILP (Vpurify_flag))
567 { 567 {
568 Lisp_Object file_truename = intern ("file-truename"); 568 if (!NILP (Ffboundp (Qfile_truename)))
569 if (!NILP (Ffboundp (file_truename))) 569 dir = call1 (Qfile_truename, dir);
570 dir = call1 (file_truename, dir);
571 } 570 }
572 dir = Fexpand_file_name (build_string ("../.."), dir); 571 dir = Fexpand_file_name (build_string ("../.."), dir);
573 } 572 }
@@ -3194,7 +3193,7 @@ You must run Emacs in batch mode in order to dump it. */)
3194 /* Bind `command-line-processed' to nil before dumping, 3193 /* Bind `command-line-processed' to nil before dumping,
3195 so that the dumped Emacs will process its command line 3194 so that the dumped Emacs will process its command line
3196 and set up to work with X windows if appropriate. */ 3195 and set up to work with X windows if appropriate. */
3197 symbol = intern ("command-line-processed"); 3196 symbol = Qcommand_line_processed;
3198 specbind (symbol, Qnil); 3197 specbind (symbol, Qnil);
3199 3198
3200 CHECK_STRING (filename); 3199 CHECK_STRING (filename);
@@ -3445,7 +3444,7 @@ decode_env_path (const char *evarname, const char *defalt, bool empty)
3445 if (SYMBOLP (tem)) 3444 if (SYMBOLP (tem))
3446 { 3445 {
3447 Lisp_Object prop; 3446 Lisp_Object prop;
3448 prop = Fget (tem, intern ("safe-magic")); 3447 prop = Fget (tem, Qsafe_magic);
3449 if (! NILP (prop)) 3448 if (! NILP (prop))
3450 tem = Qnil; 3449 tem = Qnil;
3451 } 3450 }
@@ -3554,6 +3553,9 @@ syms_of_emacs (void)
3554 DEFSYM (Qkill_emacs_hook, "kill-emacs-hook"); 3553 DEFSYM (Qkill_emacs_hook, "kill-emacs-hook");
3555 DEFSYM (Qrun_hook_query_error_with_timeout, 3554 DEFSYM (Qrun_hook_query_error_with_timeout,
3556 "run-hook-query-error-with-timeout"); 3555 "run-hook-query-error-with-timeout");
3556 DEFSYM (Qfile_truename, "file-truename");
3557 DEFSYM (Qcommand_line_processed, "command-line-processed");
3558 DEFSYM (Qsafe_magic, "safe-magic");
3557 3559
3558#ifdef HAVE_UNEXEC 3560#ifdef HAVE_UNEXEC
3559 defsubr (&Sdump_emacs); 3561 defsubr (&Sdump_emacs);
diff --git a/src/eval.c b/src/eval.c
index d3761c31f88..637c874871d 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -292,7 +292,7 @@ call_debugger (Lisp_Object arg)
292 displayed if the debugger is invoked during redisplay. */ 292 displayed if the debugger is invoked during redisplay. */
293 debug_while_redisplaying = redisplaying_p; 293 debug_while_redisplaying = redisplaying_p;
294 redisplaying_p = 0; 294 redisplaying_p = 0;
295 specbind (intern ("debugger-may-continue"), 295 specbind (Qdebugger_may_continue,
296 debug_while_redisplaying ? Qnil : Qt); 296 debug_while_redisplaying ? Qnil : Qt);
297 specbind (Qinhibit_redisplay, Qnil); 297 specbind (Qinhibit_redisplay, Qnil);
298 specbind (Qinhibit_debugger, Qt); 298 specbind (Qinhibit_debugger, Qt);
@@ -668,8 +668,8 @@ signal a `cyclic-variable-indirection' error. */)
668 else if (!NILP (Fboundp (new_alias)) 668 else if (!NILP (Fboundp (new_alias))
669 && !EQ (find_symbol_value (new_alias), 669 && !EQ (find_symbol_value (new_alias),
670 find_symbol_value (base_variable))) 670 find_symbol_value (base_variable)))
671 call2 (intern ("display-warning"), 671 call2 (Qdisplay_warning,
672 list3 (Qdefvaralias, intern ("losing-value"), new_alias), 672 list3 (Qdefvaralias, Qlosing_value, new_alias),
673 CALLN (Fformat_message, 673 CALLN (Fformat_message,
674 build_string 674 build_string
675 ("Overwriting value of `%s' by aliasing to `%s'"), 675 ("Overwriting value of `%s' by aliasing to `%s'"),
@@ -4313,6 +4313,9 @@ before making `inhibit-quit' nil. */);
4313 DEFSYM (Qdebug, "debug"); 4313 DEFSYM (Qdebug, "debug");
4314 DEFSYM (Qdebug_early, "debug-early"); 4314 DEFSYM (Qdebug_early, "debug-early");
4315 DEFSYM (Qdebug_early__handler, "debug-early--handler"); 4315 DEFSYM (Qdebug_early__handler, "debug-early--handler");
4316 DEFSYM (Qdebugger_may_continue, "debugger-may-continue");
4317 DEFSYM (Qdisplay_warning, "display-warning");
4318 DEFSYM (Qlosing_value, "losing-value");
4316 4319
4317 DEFVAR_LISP ("inhibit-debugger", Vinhibit_debugger, 4320 DEFVAR_LISP ("inhibit-debugger", Vinhibit_debugger,
4318 doc: /* Non-nil means never enter the debugger. 4321 doc: /* Non-nil means never enter the debugger.
diff --git a/src/fileio.c b/src/fileio.c
index 12da7a9ed3a..960a3b21dc0 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -2205,7 +2205,7 @@ barf_or_query_if_file_exists (Lisp_Object absname, bool known_to_exist,
2205 AUTO_STRING (format, "File %s already exists; %s anyway? "); 2205 AUTO_STRING (format, "File %s already exists; %s anyway? ");
2206 tem = CALLN (Fformat, format, absname, build_string (querystring)); 2206 tem = CALLN (Fformat, format, absname, build_string (querystring));
2207 if (quick) 2207 if (quick)
2208 tem = call1 (intern ("y-or-n-p"), tem); 2208 tem = call1 (Qy_or_n_p, tem);
2209 else 2209 else
2210 tem = do_yes_or_no_p (tem); 2210 tem = do_yes_or_no_p (tem);
2211 if (NILP (tem)) 2211 if (NILP (tem))
@@ -4550,7 +4550,7 @@ by calling `format-decode', which see. */)
4550 current_buffer->modtime earlier, but we could still end up calling 4550 current_buffer->modtime earlier, but we could still end up calling
4551 ask-user-about-supersession-threat if the file is modified while 4551 ask-user-about-supersession-threat if the file is modified while
4552 we read it, so we bind buffer-file-name instead. */ 4552 we read it, so we bind buffer-file-name instead. */
4553 specbind (intern ("buffer-file-name"), Qnil); 4553 specbind (Qbuffer_file_name, Qnil);
4554 del_range_byte (same_at_start, same_at_end); 4554 del_range_byte (same_at_start, same_at_end);
4555 /* Insert from the file at the proper position. */ 4555 /* Insert from the file at the proper position. */
4556 temp = BYTE_TO_CHAR (same_at_start); 4556 temp = BYTE_TO_CHAR (same_at_start);
@@ -4660,7 +4660,7 @@ by calling `format-decode', which see. */)
4660 if (same_at_start != same_at_end) 4660 if (same_at_start != same_at_end)
4661 { 4661 {
4662 /* See previous specbind for the reason behind this. */ 4662 /* See previous specbind for the reason behind this. */
4663 specbind (intern ("buffer-file-name"), Qnil); 4663 specbind (Qbuffer_file_name, Qnil);
4664 del_range_byte (same_at_start, same_at_end); 4664 del_range_byte (same_at_start, same_at_end);
4665 } 4665 }
4666 inserted = 0; 4666 inserted = 0;
@@ -4710,7 +4710,7 @@ by calling `format-decode', which see. */)
4710 inserted -= (ZV_BYTE - same_at_end) + (same_at_start - BEGV_BYTE); 4710 inserted -= (ZV_BYTE - same_at_end) + (same_at_start - BEGV_BYTE);
4711 4711
4712 /* See previous specbind for the reason behind this. */ 4712 /* See previous specbind for the reason behind this. */
4713 specbind (intern ("buffer-file-name"), Qnil); 4713 specbind (Qbuffer_file_name, Qnil);
4714 if (same_at_end != same_at_start) 4714 if (same_at_end != same_at_start)
4715 { 4715 {
4716 del_range_byte (same_at_start, same_at_end); 4716 del_range_byte (same_at_start, same_at_end);
@@ -6107,8 +6107,8 @@ auto_save_error (Lisp_Object error_val)
6107 AUTO_STRING (format, "Auto-saving %s: %s"); 6107 AUTO_STRING (format, "Auto-saving %s: %s");
6108 Lisp_Object msg = CALLN (Fformat, format, BVAR (current_buffer, name), 6108 Lisp_Object msg = CALLN (Fformat, format, BVAR (current_buffer, name),
6109 Ferror_message_string (error_val)); 6109 Ferror_message_string (error_val));
6110 call3 (intern ("display-warning"), 6110 call3 (Qdisplay_warning,
6111 intern ("auto-save"), msg, intern (":error")); 6111 Qauto_save, msg, QCerror);
6112 6112
6113 return Qnil; 6113 return Qnil;
6114} 6114}
@@ -6223,7 +6223,7 @@ A non-nil CURRENT-ONLY argument means save only current buffer. */)
6223 oquit = Vquit_flag; 6223 oquit = Vquit_flag;
6224 Vquit_flag = Qnil; 6224 Vquit_flag = Qnil;
6225 6225
6226 hook = intern ("auto-save-hook"); 6226 hook = Qauto_save_hook;
6227 safe_run_hooks (hook); 6227 safe_run_hooks (hook);
6228 6228
6229 if (STRINGP (Vauto_save_list_file_name)) 6229 if (STRINGP (Vauto_save_list_file_name))
@@ -6914,4 +6914,8 @@ This includes interactive calls to `delete-file' and
6914#endif /* HAVE_SYNC */ 6914#endif /* HAVE_SYNC */
6915 6915
6916 DEFSYM (Qif_regular, "if-regular"); 6916 DEFSYM (Qif_regular, "if-regular");
6917 DEFSYM (Qbuffer_file_name, "buffer-file-name");
6918 DEFSYM (Qauto_save, "auto-save");
6919 DEFSYM (QCerror, ":error");
6920 DEFSYM (Qauto_save_hook, "auto-save-hook");
6917} 6921}
diff --git a/src/filelock.c b/src/filelock.c
index e5b352cb6ff..050cac565c9 100644
--- a/src/filelock.c
+++ b/src/filelock.c
@@ -274,7 +274,7 @@ lock_file_1 (Lisp_Object lfname, bool force)
274 /* Protect against the extremely unlikely case of the host name 274 /* Protect against the extremely unlikely case of the host name
275 containing an @ character. */ 275 containing an @ character. */
276 if (!NILP (lhost_name) && strchr (SSDATA (lhost_name), '@')) 276 if (!NILP (lhost_name) && strchr (SSDATA (lhost_name), '@'))
277 lhost_name = CALLN (Ffuncall, intern ("string-replace"), 277 lhost_name = CALLN (Ffuncall, Qstring_replace,
278 build_string ("@"), build_string ("-"), 278 build_string ("@"), build_string ("-"),
279 lhost_name); 279 lhost_name);
280 280
@@ -791,6 +791,7 @@ Info node `(emacs)Interlocking'. */);
791 DEFSYM (Qunlock_file, "unlock-file"); 791 DEFSYM (Qunlock_file, "unlock-file");
792 DEFSYM (Qfile_locked_p, "file-locked-p"); 792 DEFSYM (Qfile_locked_p, "file-locked-p");
793 DEFSYM (Qmake_lock_file_name, "make-lock-file-name"); 793 DEFSYM (Qmake_lock_file_name, "make-lock-file-name");
794 DEFSYM (Qstring_replace, "string-replace");
794 795
795 defsubr (&Slock_file); 796 defsubr (&Slock_file);
796 defsubr (&Sunlock_file); 797 defsubr (&Sunlock_file);
diff --git a/src/fontset.c b/src/fontset.c
index dfa0d59d31d..a98d75606b3 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -1823,7 +1823,7 @@ fontset_from_font (Lisp_Object font_object)
1823 if (CONSP (val)) 1823 if (CONSP (val))
1824 return XFIXNUM (FONTSET_ID (XCDR (val))); 1824 return XFIXNUM (FONTSET_ID (XCDR (val)));
1825 if (num_auto_fontsets++ == 0) 1825 if (num_auto_fontsets++ == 0)
1826 alias = intern ("fontset-startup"); 1826 alias = Qfontset_startup;
1827 else 1827 else
1828 { 1828 {
1829 char temp[sizeof "fontset-auto" + INT_STRLEN_BOUND (ptrdiff_t)]; 1829 char temp[sizeof "fontset-auto" + INT_STRLEN_BOUND (ptrdiff_t)];
@@ -2174,6 +2174,7 @@ syms_of_fontset (void)
2174 Fput (Qfontset, Qchar_table_extra_slots, make_fixnum (8)); 2174 Fput (Qfontset, Qchar_table_extra_slots, make_fixnum (8));
2175 DEFSYM (Qfontset_info, "fontset-info"); 2175 DEFSYM (Qfontset_info, "fontset-info");
2176 Fput (Qfontset_info, Qchar_table_extra_slots, make_fixnum (1)); 2176 Fput (Qfontset_info, Qchar_table_extra_slots, make_fixnum (1));
2177 DEFSYM (Qfontset_startup, "fontset-startup");
2177 2178
2178 DEFSYM (Qappend, "append"); 2179 DEFSYM (Qappend, "append");
2179 DEFSYM (Qlatin, "latin"); 2180 DEFSYM (Qlatin, "latin");
diff --git a/src/frame.c b/src/frame.c
index a671dbaa31d..80aa4a4a2e8 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -1114,12 +1114,12 @@ make_frame_without_minibuffer (Lisp_Object mini_window, KBOARD *kb,
1114 if (!FRAMEP (KVAR (kb, Vdefault_minibuffer_frame)) 1114 if (!FRAMEP (KVAR (kb, Vdefault_minibuffer_frame))
1115 || ! FRAME_LIVE_P (XFRAME (KVAR (kb, Vdefault_minibuffer_frame)))) 1115 || ! FRAME_LIVE_P (XFRAME (KVAR (kb, Vdefault_minibuffer_frame))))
1116 { 1116 {
1117 Lisp_Object frame_dummy; 1117 Lisp_Object initial_frame;
1118 1118
1119 XSETFRAME (frame_dummy, f);
1120 /* If there's no minibuffer frame to use, create one. */ 1119 /* If there's no minibuffer frame to use, create one. */
1121 kset_default_minibuffer_frame 1120 initial_frame = call1 (Qmake_initial_minibuffer_frame,
1122 (kb, call1 (intern ("make-initial-minibuffer-frame"), display)); 1121 display);
1122 kset_default_minibuffer_frame (kb, initial_frame);
1123 } 1123 }
1124 1124
1125 mini_window 1125 mini_window
@@ -6268,6 +6268,7 @@ syms_of_frame (void)
6268 DEFSYM (Qframe_windows_min_size, "frame-windows-min-size"); 6268 DEFSYM (Qframe_windows_min_size, "frame-windows-min-size");
6269 DEFSYM (Qframe_monitor_attributes, "frame-monitor-attributes"); 6269 DEFSYM (Qframe_monitor_attributes, "frame-monitor-attributes");
6270 DEFSYM (Qwindow__pixel_to_total, "window--pixel-to-total"); 6270 DEFSYM (Qwindow__pixel_to_total, "window--pixel-to-total");
6271 DEFSYM (Qmake_initial_minibuffer_frame, "make-initial-minibuffer-frame");
6271 DEFSYM (Qexplicit_name, "explicit-name"); 6272 DEFSYM (Qexplicit_name, "explicit-name");
6272 DEFSYM (Qheight, "height"); 6273 DEFSYM (Qheight, "height");
6273 DEFSYM (Qicon, "icon"); 6274 DEFSYM (Qicon, "icon");
diff --git a/src/gnutls.c b/src/gnutls.c
index 54b7eb4c90e..efee2dccbb4 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -1142,7 +1142,7 @@ emacs_gnutls_certificate_details (gnutls_x509_crt_t cert)
1142 int version = gnutls_x509_crt_get_version (cert); 1142 int version = gnutls_x509_crt_get_version (cert);
1143 check_memory_full (version); 1143 check_memory_full (version);
1144 if (version >= GNUTLS_E_SUCCESS) 1144 if (version >= GNUTLS_E_SUCCESS)
1145 res = nconc2 (res, list2 (intern (":version"), 1145 res = nconc2 (res, list2 (QCversion,
1146 make_fixnum (version))); 1146 make_fixnum (version)));
1147 } 1147 }
1148 1148
@@ -1156,7 +1156,7 @@ emacs_gnutls_certificate_details (gnutls_x509_crt_t cert)
1156 err = gnutls_x509_crt_get_serial (cert, serial, &buf_size); 1156 err = gnutls_x509_crt_get_serial (cert, serial, &buf_size);
1157 check_memory_full (err); 1157 check_memory_full (err);
1158 if (err >= GNUTLS_E_SUCCESS) 1158 if (err >= GNUTLS_E_SUCCESS)
1159 res = nconc2 (res, list2 (intern (":serial-number"), 1159 res = nconc2 (res, list2 (QCserial_number,
1160 gnutls_hex_string (serial, buf_size, ""))); 1160 gnutls_hex_string (serial, buf_size, "")));
1161 xfree (serial); 1161 xfree (serial);
1162 } 1162 }
@@ -1171,7 +1171,7 @@ emacs_gnutls_certificate_details (gnutls_x509_crt_t cert)
1171 err = gnutls_x509_crt_get_issuer_dn (cert, dn, &buf_size); 1171 err = gnutls_x509_crt_get_issuer_dn (cert, dn, &buf_size);
1172 check_memory_full (err); 1172 check_memory_full (err);
1173 if (err >= GNUTLS_E_SUCCESS) 1173 if (err >= GNUTLS_E_SUCCESS)
1174 res = nconc2 (res, list2 (intern (":issuer"), 1174 res = nconc2 (res, list2 (QCissuer,
1175 make_string (dn, buf_size))); 1175 make_string (dn, buf_size)));
1176 xfree (dn); 1176 xfree (dn);
1177 } 1177 }
@@ -1185,11 +1185,11 @@ emacs_gnutls_certificate_details (gnutls_x509_crt_t cert)
1185 time_t tim = gnutls_x509_crt_get_activation_time (cert); 1185 time_t tim = gnutls_x509_crt_get_activation_time (cert);
1186 1186
1187 if (gmtime_r (&tim, &t) && strftime (buf, sizeof buf, "%Y-%m-%d", &t)) 1187 if (gmtime_r (&tim, &t) && strftime (buf, sizeof buf, "%Y-%m-%d", &t))
1188 res = nconc2 (res, list2 (intern (":valid-from"), build_string (buf))); 1188 res = nconc2 (res, list2 (QCvalid_from, build_string (buf)));
1189 1189
1190 tim = gnutls_x509_crt_get_expiration_time (cert); 1190 tim = gnutls_x509_crt_get_expiration_time (cert);
1191 if (gmtime_r (&tim, &t) && strftime (buf, sizeof buf, "%Y-%m-%d", &t)) 1191 if (gmtime_r (&tim, &t) && strftime (buf, sizeof buf, "%Y-%m-%d", &t))
1192 res = nconc2 (res, list2 (intern (":valid-to"), build_string (buf))); 1192 res = nconc2 (res, list2 (QCvalid_to, build_string (buf)));
1193 } 1193 }
1194 1194
1195 /* Subject. */ 1195 /* Subject. */
@@ -1202,7 +1202,7 @@ emacs_gnutls_certificate_details (gnutls_x509_crt_t cert)
1202 err = gnutls_x509_crt_get_dn (cert, dn, &buf_size); 1202 err = gnutls_x509_crt_get_dn (cert, dn, &buf_size);
1203 check_memory_full (err); 1203 check_memory_full (err);
1204 if (err >= GNUTLS_E_SUCCESS) 1204 if (err >= GNUTLS_E_SUCCESS)
1205 res = nconc2 (res, list2 (intern (":subject"), 1205 res = nconc2 (res, list2 (QCsubject,
1206 make_string (dn, buf_size))); 1206 make_string (dn, buf_size)));
1207 xfree (dn); 1207 xfree (dn);
1208 } 1208 }
@@ -1217,12 +1217,12 @@ emacs_gnutls_certificate_details (gnutls_x509_crt_t cert)
1217 { 1217 {
1218 const char *name = gnutls_pk_algorithm_get_name (err); 1218 const char *name = gnutls_pk_algorithm_get_name (err);
1219 if (name) 1219 if (name)
1220 res = nconc2 (res, list2 (intern (":public-key-algorithm"), 1220 res = nconc2 (res, list2 (QCpublic_key_algorithm,
1221 build_string (name))); 1221 build_string (name)));
1222 1222
1223 name = gnutls_sec_param_get_name (gnutls_pk_bits_to_sec_param 1223 name = gnutls_sec_param_get_name (gnutls_pk_bits_to_sec_param
1224 (err, bits)); 1224 (err, bits));
1225 res = nconc2 (res, list2 (intern (":certificate-security-level"), 1225 res = nconc2 (res, list2 (QCcertificate_security_level,
1226 build_string (name))); 1226 build_string (name)));
1227 } 1227 }
1228 } 1228 }
@@ -1237,7 +1237,7 @@ emacs_gnutls_certificate_details (gnutls_x509_crt_t cert)
1237 err = gnutls_x509_crt_get_issuer_unique_id (cert, buf, &buf_size); 1237 err = gnutls_x509_crt_get_issuer_unique_id (cert, buf, &buf_size);
1238 check_memory_full (err); 1238 check_memory_full (err);
1239 if (err >= GNUTLS_E_SUCCESS) 1239 if (err >= GNUTLS_E_SUCCESS)
1240 res = nconc2 (res, list2 (intern (":issuer-unique-id"), 1240 res = nconc2 (res, list2 (QCissuer_unique_id,
1241 make_string (buf, buf_size))); 1241 make_string (buf, buf_size)));
1242 xfree (buf); 1242 xfree (buf);
1243 } 1243 }
@@ -1251,7 +1251,7 @@ emacs_gnutls_certificate_details (gnutls_x509_crt_t cert)
1251 err = gnutls_x509_crt_get_subject_unique_id (cert, buf, &buf_size); 1251 err = gnutls_x509_crt_get_subject_unique_id (cert, buf, &buf_size);
1252 check_memory_full (err); 1252 check_memory_full (err);
1253 if (err >= GNUTLS_E_SUCCESS) 1253 if (err >= GNUTLS_E_SUCCESS)
1254 res = nconc2 (res, list2 (intern (":subject-unique-id"), 1254 res = nconc2 (res, list2 (QCsubject_unique_id,
1255 make_string (buf, buf_size))); 1255 make_string (buf, buf_size)));
1256 xfree (buf); 1256 xfree (buf);
1257 } 1257 }
@@ -1263,7 +1263,7 @@ emacs_gnutls_certificate_details (gnutls_x509_crt_t cert)
1263 { 1263 {
1264 const char *name = gnutls_sign_get_name (err); 1264 const char *name = gnutls_sign_get_name (err);
1265 if (name) 1265 if (name)
1266 res = nconc2 (res, list2 (intern (":signature-algorithm"), 1266 res = nconc2 (res, list2 (QCsignature_algorithm,
1267 build_string (name))); 1267 build_string (name)));
1268 } 1268 }
1269 1269
@@ -1277,7 +1277,7 @@ emacs_gnutls_certificate_details (gnutls_x509_crt_t cert)
1277 err = gnutls_x509_crt_get_key_id (cert, 0, buf, &buf_size); 1277 err = gnutls_x509_crt_get_key_id (cert, 0, buf, &buf_size);
1278 check_memory_full (err); 1278 check_memory_full (err);
1279 if (err >= GNUTLS_E_SUCCESS) 1279 if (err >= GNUTLS_E_SUCCESS)
1280 res = nconc2 (res, list2 (intern (":public-key-id"), 1280 res = nconc2 (res, list2 (QCpublic_key_id,
1281 gnutls_hex_string (buf, buf_size, "sha1:"))); 1281 gnutls_hex_string (buf, buf_size, "sha1:")));
1282 xfree (buf); 1282 xfree (buf);
1283 } 1283 }
@@ -1293,7 +1293,7 @@ emacs_gnutls_certificate_details (gnutls_x509_crt_t cert)
1293 err = gnutls_x509_crt_get_key_id (cert, GNUTLS_KEYID_USE_SHA256, buf, &buf_size); 1293 err = gnutls_x509_crt_get_key_id (cert, GNUTLS_KEYID_USE_SHA256, buf, &buf_size);
1294 check_memory_full (err); 1294 check_memory_full (err);
1295 if (err >= GNUTLS_E_SUCCESS) 1295 if (err >= GNUTLS_E_SUCCESS)
1296 res = nconc2 (res, list2 (intern (":public-key-id-sha256"), 1296 res = nconc2 (res, list2 (QCpublic_key_id_sha256,
1297 gnutls_hex_string (buf, buf_size, "sha256:"))); 1297 gnutls_hex_string (buf, buf_size, "sha256:")));
1298 xfree (buf); 1298 xfree (buf);
1299 } 1299 }
@@ -1311,13 +1311,13 @@ emacs_gnutls_certificate_details (gnutls_x509_crt_t cert)
1311 buf, &buf_size); 1311 buf, &buf_size);
1312 check_memory_full (err); 1312 check_memory_full (err);
1313 if (err >= GNUTLS_E_SUCCESS) 1313 if (err >= GNUTLS_E_SUCCESS)
1314 res = nconc2 (res, list2 (intern (":certificate-id"), 1314 res = nconc2 (res, list2 (QCcertificate_id,
1315 gnutls_hex_string (buf, buf_size, "sha1:"))); 1315 gnutls_hex_string (buf, buf_size, "sha1:")));
1316 xfree (buf); 1316 xfree (buf);
1317 } 1317 }
1318 1318
1319 /* PEM */ 1319 /* PEM */
1320 res = nconc2 (res, list2 (intern (":pem"), 1320 res = nconc2 (res, list2 (QCpem,
1321 emacs_gnutls_certificate_export_pem(cert))); 1321 emacs_gnutls_certificate_export_pem(cert)));
1322 1322
1323 return res; 1323 return res;
@@ -1329,55 +1329,55 @@ DEFUN ("gnutls-peer-status-warning-describe", Fgnutls_peer_status_warning_descri
1329{ 1329{
1330 CHECK_SYMBOL (status_symbol); 1330 CHECK_SYMBOL (status_symbol);
1331 1331
1332 if (EQ (status_symbol, intern (":invalid"))) 1332 if (EQ (status_symbol, QCinvalid))
1333 return build_string ("certificate could not be verified"); 1333 return build_string ("certificate could not be verified");
1334 1334
1335 if (EQ (status_symbol, intern (":revoked"))) 1335 if (EQ (status_symbol, QCrevoked))
1336 return build_string ("certificate was revoked (CRL)"); 1336 return build_string ("certificate was revoked (CRL)");
1337 1337
1338 if (EQ (status_symbol, intern (":self-signed"))) 1338 if (EQ (status_symbol, QCself_signed))
1339 return build_string ("certificate signer was not found (self-signed)"); 1339 return build_string ("certificate signer was not found (self-signed)");
1340 1340
1341 if (EQ (status_symbol, intern (":unknown-ca"))) 1341 if (EQ (status_symbol, QCunknown_ca))
1342 return build_string ("the certificate was signed by an unknown " 1342 return build_string ("the certificate was signed by an unknown "
1343 "and therefore untrusted authority"); 1343 "and therefore untrusted authority");
1344 1344
1345 if (EQ (status_symbol, intern (":not-ca"))) 1345 if (EQ (status_symbol, QCnot_ca))
1346 return build_string ("certificate signer is not a CA"); 1346 return build_string ("certificate signer is not a CA");
1347 1347
1348 if (EQ (status_symbol, intern (":insecure"))) 1348 if (EQ (status_symbol, QCinsecure))
1349 return build_string ("certificate was signed with an insecure algorithm"); 1349 return build_string ("certificate was signed with an insecure algorithm");
1350 1350
1351 if (EQ (status_symbol, intern (":not-activated"))) 1351 if (EQ (status_symbol, QCnot_activated))
1352 return build_string ("certificate is not yet activated"); 1352 return build_string ("certificate is not yet activated");
1353 1353
1354 if (EQ (status_symbol, intern (":expired"))) 1354 if (EQ (status_symbol, QCexpired))
1355 return build_string ("certificate has expired"); 1355 return build_string ("certificate has expired");
1356 1356
1357 if (EQ (status_symbol, intern (":no-host-match"))) 1357 if (EQ (status_symbol, QCno_host_match))
1358 return build_string ("certificate host does not match hostname"); 1358 return build_string ("certificate host does not match hostname");
1359 1359
1360 if (EQ (status_symbol, intern (":signature-failure"))) 1360 if (EQ (status_symbol, QCsignature_failure))
1361 return build_string ("certificate signature could not be verified"); 1361 return build_string ("certificate signature could not be verified");
1362 1362
1363 if (EQ (status_symbol, intern (":revocation-data-superseded"))) 1363 if (EQ (status_symbol, QCrevocation_data_superseded))
1364 return build_string ("certificate revocation data are old and have been " 1364 return build_string ("certificate revocation data are old and have been "
1365 "superseded"); 1365 "superseded");
1366 1366
1367 if (EQ (status_symbol, intern (":revocation-data-issued-in-future"))) 1367 if (EQ (status_symbol, QCrevocation_data_issued_in_future))
1368 return build_string ("certificate revocation data have a future issue date"); 1368 return build_string ("certificate revocation data have a future issue date");
1369 1369
1370 if (EQ (status_symbol, intern (":signer-constraints-failure"))) 1370 if (EQ (status_symbol, QCsigner_constraints_failure))
1371 return build_string ("certificate signer constraints were violated"); 1371 return build_string ("certificate signer constraints were violated");
1372 1372
1373 if (EQ (status_symbol, intern (":purpose-mismatch"))) 1373 if (EQ (status_symbol, QCpurpose_mismatch))
1374 return build_string ("certificate does not match the intended purpose"); 1374 return build_string ("certificate does not match the intended purpose");
1375 1375
1376 if (EQ (status_symbol, intern (":missing-ocsp-status"))) 1376 if (EQ (status_symbol, QCmissing_ocsp_status))
1377 return build_string ("certificate requires the server to send a OCSP " 1377 return build_string ("certificate requires the server to send a OCSP "
1378 "certificate status, but no status was received"); 1378 "certificate status, but no status was received");
1379 1379
1380 if (EQ (status_symbol, intern (":invalid-ocsp-status"))) 1380 if (EQ (status_symbol, QCinvalid_ocsp_status))
1381 return build_string ("the received OCSP certificate status is invalid"); 1381 return build_string ("the received OCSP certificate status is invalid");
1382 1382
1383 return Qnil; 1383 return Qnil;
@@ -1411,50 +1411,50 @@ returned as the :certificate entry. */)
1411 verification = XPROCESS (proc)->gnutls_peer_verification; 1411 verification = XPROCESS (proc)->gnutls_peer_verification;
1412 1412
1413 if (verification & GNUTLS_CERT_INVALID) 1413 if (verification & GNUTLS_CERT_INVALID)
1414 warnings = Fcons (intern (":invalid"), warnings); 1414 warnings = Fcons (QCinvalid, warnings);
1415 1415
1416 if (verification & GNUTLS_CERT_REVOKED) 1416 if (verification & GNUTLS_CERT_REVOKED)
1417 warnings = Fcons (intern (":revoked"), warnings); 1417 warnings = Fcons (QCrevoked, warnings);
1418 1418
1419 if (verification & GNUTLS_CERT_SIGNER_NOT_FOUND) 1419 if (verification & GNUTLS_CERT_SIGNER_NOT_FOUND)
1420 warnings = Fcons (intern (":unknown-ca"), warnings); 1420 warnings = Fcons (QCunknown_ca, warnings);
1421 1421
1422 if (verification & GNUTLS_CERT_SIGNER_NOT_CA) 1422 if (verification & GNUTLS_CERT_SIGNER_NOT_CA)
1423 warnings = Fcons (intern (":not-ca"), warnings); 1423 warnings = Fcons (QCnot_ca, warnings);
1424 1424
1425 if (verification & GNUTLS_CERT_INSECURE_ALGORITHM) 1425 if (verification & GNUTLS_CERT_INSECURE_ALGORITHM)
1426 warnings = Fcons (intern (":insecure"), warnings); 1426 warnings = Fcons (QCinsecure, warnings);
1427 1427
1428 if (verification & GNUTLS_CERT_NOT_ACTIVATED) 1428 if (verification & GNUTLS_CERT_NOT_ACTIVATED)
1429 warnings = Fcons (intern (":not-activated"), warnings); 1429 warnings = Fcons (QCnot_activated, warnings);
1430 1430
1431 if (verification & GNUTLS_CERT_EXPIRED) 1431 if (verification & GNUTLS_CERT_EXPIRED)
1432 warnings = Fcons (intern (":expired"), warnings); 1432 warnings = Fcons (QCexpired, warnings);
1433 1433
1434# if GNUTLS_VERSION_NUMBER >= 0x030100 1434# if GNUTLS_VERSION_NUMBER >= 0x030100
1435 if (verification & GNUTLS_CERT_SIGNATURE_FAILURE) 1435 if (verification & GNUTLS_CERT_SIGNATURE_FAILURE)
1436 warnings = Fcons (intern (":signature-failure"), warnings); 1436 warnings = Fcons (QCsignature_failure, warnings);
1437 1437
1438# if GNUTLS_VERSION_NUMBER >= 0x030114 1438# if GNUTLS_VERSION_NUMBER >= 0x030114
1439 if (verification & GNUTLS_CERT_REVOCATION_DATA_SUPERSEDED) 1439 if (verification & GNUTLS_CERT_REVOCATION_DATA_SUPERSEDED)
1440 warnings = Fcons (intern (":revocation-data-superseded"), warnings); 1440 warnings = Fcons (QCrevocation_data_superseded, warnings);
1441 1441
1442 if (verification & GNUTLS_CERT_REVOCATION_DATA_ISSUED_IN_FUTURE) 1442 if (verification & GNUTLS_CERT_REVOCATION_DATA_ISSUED_IN_FUTURE)
1443 warnings = Fcons (intern (":revocation-data-issued-in-future"), warnings); 1443 warnings = Fcons (QCrevocation_data_issued_in_future, warnings);
1444 1444
1445 if (verification & GNUTLS_CERT_SIGNER_CONSTRAINTS_FAILURE) 1445 if (verification & GNUTLS_CERT_SIGNER_CONSTRAINTS_FAILURE)
1446 warnings = Fcons (intern (":signer-constraints-failure"), warnings); 1446 warnings = Fcons (QCsigner_constraints_failure, warnings);
1447 1447
1448# if GNUTLS_VERSION_NUMBER >= 0x030400 1448# if GNUTLS_VERSION_NUMBER >= 0x030400
1449 if (verification & GNUTLS_CERT_PURPOSE_MISMATCH) 1449 if (verification & GNUTLS_CERT_PURPOSE_MISMATCH)
1450 warnings = Fcons (intern (":purpose-mismatch"), warnings); 1450 warnings = Fcons (QCpurpose_mismatch, warnings);
1451 1451
1452# if GNUTLS_VERSION_NUMBER >= 0x030501 1452# if GNUTLS_VERSION_NUMBER >= 0x030501
1453 if (verification & GNUTLS_CERT_MISSING_OCSP_STATUS) 1453 if (verification & GNUTLS_CERT_MISSING_OCSP_STATUS)
1454 warnings = Fcons (intern (":missing-ocsp-status"), warnings); 1454 warnings = Fcons (QCmissing_ocsp_status, warnings);
1455 1455
1456 if (verification & GNUTLS_CERT_INVALID_OCSP_STATUS) 1456 if (verification & GNUTLS_CERT_INVALID_OCSP_STATUS)
1457 warnings = Fcons (intern (":invalid-ocsp-status"), warnings); 1457 warnings = Fcons (QCinvalid_ocsp_status, warnings);
1458# endif 1458# endif
1459# endif 1459# endif
1460# endif 1460# endif
@@ -1462,17 +1462,17 @@ returned as the :certificate entry. */)
1462 1462
1463 if (XPROCESS (proc)->gnutls_extra_peer_verification & 1463 if (XPROCESS (proc)->gnutls_extra_peer_verification &
1464 CERTIFICATE_NOT_MATCHING) 1464 CERTIFICATE_NOT_MATCHING)
1465 warnings = Fcons (intern (":no-host-match"), warnings); 1465 warnings = Fcons (QCno_host_match, warnings);
1466 1466
1467 /* This could get called in the INIT stage, when the certificate is 1467 /* This could get called in the INIT stage, when the certificate is
1468 not yet set. */ 1468 not yet set. */
1469 if (XPROCESS (proc)->gnutls_certificates != NULL && 1469 if (XPROCESS (proc)->gnutls_certificates != NULL &&
1470 gnutls_x509_crt_check_issuer(XPROCESS (proc)->gnutls_certificates[0], 1470 gnutls_x509_crt_check_issuer(XPROCESS (proc)->gnutls_certificates[0],
1471 XPROCESS (proc)->gnutls_certificates[0])) 1471 XPROCESS (proc)->gnutls_certificates[0]))
1472 warnings = Fcons (intern (":self-signed"), warnings); 1472 warnings = Fcons (QCself_signed, warnings);
1473 1473
1474 if (!NILP (warnings)) 1474 if (!NILP (warnings))
1475 result = list2 (intern (":warnings"), warnings); 1475 result = list2 (QCwarnings, warnings);
1476 1476
1477 /* This could get called in the INIT stage, when the certificate is 1477 /* This could get called in the INIT stage, when the certificate is
1478 not yet set. */ 1478 not yet set. */
@@ -1485,11 +1485,11 @@ returned as the :certificate entry. */)
1485 certs = nconc2 (certs, list1 (emacs_gnutls_certificate_details 1485 certs = nconc2 (certs, list1 (emacs_gnutls_certificate_details
1486 (XPROCESS (proc)->gnutls_certificates[i]))); 1486 (XPROCESS (proc)->gnutls_certificates[i])));
1487 1487
1488 result = nconc2 (result, list2 (intern (":certificates"), certs)); 1488 result = nconc2 (result, list2 (QCcertificates, certs));
1489 1489
1490 /* Return the host certificate in its own element for 1490 /* Return the host certificate in its own element for
1491 compatibility reasons. */ 1491 compatibility reasons. */
1492 result = nconc2 (result, list2 (intern (":certificate"), Fcar (certs))); 1492 result = nconc2 (result, list2 (QCcertificate, Fcar (certs)));
1493 } 1493 }
1494 1494
1495 state = XPROCESS (proc)->gnutls_state; 1495 state = XPROCESS (proc)->gnutls_state;
@@ -1499,38 +1499,38 @@ returned as the :certificate entry. */)
1499 int bits = gnutls_dh_get_prime_bits (state); 1499 int bits = gnutls_dh_get_prime_bits (state);
1500 check_memory_full (bits); 1500 check_memory_full (bits);
1501 if (bits > 0) 1501 if (bits > 0)
1502 result = nconc2 (result, list2 (intern (":diffie-hellman-prime-bits"), 1502 result = nconc2 (result, list2 (QCdiffie_hellman_prime_bits,
1503 make_fixnum (bits))); 1503 make_fixnum (bits)));
1504 } 1504 }
1505 1505
1506 /* Key exchange. */ 1506 /* Key exchange. */
1507 result = nconc2 1507 result = nconc2
1508 (result, list2 (intern (":key-exchange"), 1508 (result, list2 (QCkey_exchange,
1509 build_string (gnutls_kx_get_name 1509 build_string (gnutls_kx_get_name
1510 (gnutls_kx_get (state))))); 1510 (gnutls_kx_get (state)))));
1511 1511
1512 /* Protocol name. */ 1512 /* Protocol name. */
1513 gnutls_protocol_t proto = gnutls_protocol_get_version (state); 1513 gnutls_protocol_t proto = gnutls_protocol_get_version (state);
1514 result = nconc2 1514 result = nconc2
1515 (result, list2 (intern (":protocol"), 1515 (result, list2 (QCprotocol,
1516 build_string (gnutls_protocol_get_name (proto)))); 1516 build_string (gnutls_protocol_get_name (proto))));
1517 1517
1518 /* Cipher name. */ 1518 /* Cipher name. */
1519 result = nconc2 1519 result = nconc2
1520 (result, list2 (intern (":cipher"), 1520 (result, list2 (QCcipher,
1521 build_string (gnutls_cipher_get_name 1521 build_string (gnutls_cipher_get_name
1522 (gnutls_cipher_get (state))))); 1522 (gnutls_cipher_get (state)))));
1523 1523
1524 /* MAC name. */ 1524 /* MAC name. */
1525 result = nconc2 1525 result = nconc2
1526 (result, list2 (intern (":mac"), 1526 (result, list2 (QCmac,
1527 build_string (gnutls_mac_get_name 1527 build_string (gnutls_mac_get_name
1528 (gnutls_mac_get (state))))); 1528 (gnutls_mac_get (state)))));
1529 1529
1530 /* Compression name. */ 1530 /* Compression name. */
1531# ifdef HAVE_GNUTLS_COMPRESSION_GET 1531# ifdef HAVE_GNUTLS_COMPRESSION_GET
1532 result = nconc2 1532 result = nconc2
1533 (result, list2 (intern (":compression"), 1533 (result, list2 (QCcompression,
1534 build_string (gnutls_compression_get_name 1534 build_string (gnutls_compression_get_name
1535 (gnutls_compression_get (state))))); 1535 (gnutls_compression_get (state)))));
1536# endif 1536# endif
@@ -1538,14 +1538,14 @@ returned as the :certificate entry. */)
1538 /* Encrypt-then-MAC. */ 1538 /* Encrypt-then-MAC. */
1539# ifdef HAVE_GNUTLS_ETM_STATUS 1539# ifdef HAVE_GNUTLS_ETM_STATUS
1540 result = nconc2 1540 result = nconc2
1541 (result, list2 (intern (":encrypt-then-mac"), 1541 (result, list2 (QCencrypt_then_mac,
1542 gnutls_session_etm_status (state) ? Qt : Qnil)); 1542 gnutls_session_etm_status (state) ? Qt : Qnil));
1543# endif 1543# endif
1544 1544
1545 /* Renegotiation Indication */ 1545 /* Renegotiation Indication */
1546 if (proto <= GNUTLS_TLS1_2) 1546 if (proto <= GNUTLS_TLS1_2)
1547 result = nconc2 1547 result = nconc2
1548 (result, list2 (intern (":safe-renegotiation"), 1548 (result, list2 (QCsafe_renegotiation,
1549 gnutls_safe_renegotiation_status (state) ? Qt : Qnil)); 1549 gnutls_safe_renegotiation_status (state) ? Qt : Qnil));
1550 1550
1551 return result; 1551 return result;
@@ -1701,7 +1701,7 @@ gnutls_verify_boot (Lisp_Object proc, Lisp_Object proplist)
1701 1701
1702 p->gnutls_peer_verification = peer_verification; 1702 p->gnutls_peer_verification = peer_verification;
1703 1703
1704 warnings = plist_get (Fgnutls_peer_status (proc), intern (":warnings")); 1704 warnings = plist_get (Fgnutls_peer_status (proc), QCwarnings);
1705 if (!NILP (warnings)) 1705 if (!NILP (warnings))
1706 { 1706 {
1707 for (Lisp_Object tail = warnings; CONSP (tail); tail = XCDR (tail)) 1707 for (Lisp_Object tail = warnings; CONSP (tail); tail = XCDR (tail))
@@ -3119,4 +3119,48 @@ are as per the GnuTLS logging conventions. */);
3119#endif /* HAVE_GNUTLS */ 3119#endif /* HAVE_GNUTLS */
3120 3120
3121 defsubr (&Sgnutls_available_p); 3121 defsubr (&Sgnutls_available_p);
3122
3123 DEFSYM (QCcertificate, ":certificate");
3124 DEFSYM (QCcertificate_id, ":certificate-id");
3125 DEFSYM (QCcertificate_security_level, ":certificate-security-level");
3126 DEFSYM (QCcertificates, ":certificates");
3127 DEFSYM (QCcipher, ":cipher");
3128 DEFSYM (QCcompression, ":compression");
3129 DEFSYM (QCdiffie_hellman_prime_bits, ":diffie-hellman-prime-bits");
3130 DEFSYM (QCencrypt_then_mac, ":encrypt-then-mac");
3131 DEFSYM (QCexpired, ":expired");
3132 DEFSYM (QCinsecure, ":insecure");
3133 DEFSYM (QCinvalid, ":invalid");
3134 DEFSYM (QCinvalid_ocsp_status, ":invalid-ocsp-status");
3135 DEFSYM (QCissuer, ":issuer");
3136 DEFSYM (QCissuer_unique_id, ":issuer-unique-id");
3137 DEFSYM (QCkey_exchange, ":key-exchange");
3138 DEFSYM (QCmac, ":mac");
3139 DEFSYM (QCmissing_ocsp_status, ":missing-ocsp-status");
3140 DEFSYM (QCno_host_match, ":no-host-match");
3141 DEFSYM (QCnot_activated, ":not-activated");
3142 DEFSYM (QCnot_ca, ":not-ca");
3143 DEFSYM (QCpem, ":pem");
3144 DEFSYM (QCprotocol, ":protocol");
3145 DEFSYM (QCpublic_key_algorithm, ":public-key-algorithm");
3146 DEFSYM (QCpublic_key_id, ":public-key-id");
3147 DEFSYM (QCpublic_key_id_sha256, ":public-key-id-sha256");
3148 DEFSYM (QCpurpose_mismatch, ":purpose-mismatch");
3149 DEFSYM (QCrevocation_data_issued_in_future,
3150 ":revocation-data-issued-in-future");
3151 DEFSYM (QCrevocation_data_superseded, ":revocation-data-superseded");
3152 DEFSYM (QCrevoked, ":revoked");
3153 DEFSYM (QCsafe_renegotiation, ":safe-renegotiation");
3154 DEFSYM (QCself_signed, ":self-signed");
3155 DEFSYM (QCserial_number, ":serial-number");
3156 DEFSYM (QCsignature_algorithm, ":signature-algorithm");
3157 DEFSYM (QCsignature_failure, ":signature-failure");
3158 DEFSYM (QCsigner_constraints_failure, ":signer-constraints-failure");
3159 DEFSYM (QCsubject, ":subject");
3160 DEFSYM (QCsubject_unique_id, ":subject-unique-id");
3161 DEFSYM (QCunknown_ca, ":unknown-ca");
3162 DEFSYM (QCvalid_from, ":valid-from");
3163 DEFSYM (QCvalid_to, ":valid-to");
3164 DEFSYM (QCversion, ":version");
3165 DEFSYM (QCwarnings, ":warnings");
3122} 3166}
diff --git a/src/gtkutil.c b/src/gtkutil.c
index c067f7b53ac..7de8eba0aa1 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -1471,8 +1471,7 @@ style_changed_cb (GObject *go,
1471 EVENT_INIT (event); 1471 EVENT_INIT (event);
1472 event.kind = CONFIG_CHANGED_EVENT; 1472 event.kind = CONFIG_CHANGED_EVENT;
1473 event.frame_or_window = build_string (display_name); 1473 event.frame_or_window = build_string (display_name);
1474 /* Theme doesn't change often, so intern is called seldom. */ 1474 event.arg = Qtheme_name;
1475 event.arg = intern ("theme-name");
1476 kbd_buffer_store_event (&event); 1475 kbd_buffer_store_event (&event);
1477 1476
1478 update_theme_scrollbar_width (); 1477 update_theme_scrollbar_width ();
@@ -5506,8 +5505,8 @@ find_rtl_image (struct frame *f, Lisp_Object image, Lisp_Object rtl)
5506 Lisp_Object rtl_image = PROP (TOOL_BAR_ITEM_IMAGES); 5505 Lisp_Object rtl_image = PROP (TOOL_BAR_ITEM_IMAGES);
5507 if (!NILP (file = file_for_image (rtl_image))) 5506 if (!NILP (file = file_for_image (rtl_image)))
5508 { 5507 {
5509 file = call1 (intern ("file-name-sans-extension"), 5508 file = call1 (Qfile_name_sans_extension,
5510 Ffile_name_nondirectory (file)); 5509 Ffile_name_nondirectory (file));
5511 if (! NILP (Fequal (file, rtl_name))) 5510 if (! NILP (Fequal (file, rtl_name)))
5512 { 5511 {
5513 image = rtl_image; 5512 image = rtl_image;
diff --git a/src/image.c b/src/image.c
index b15d68bf9bf..e93fc3183af 100644
--- a/src/image.c
+++ b/src/image.c
@@ -10721,14 +10721,14 @@ imagemagick_error (MagickWand *wand)
10721static char * 10721static char *
10722imagemagick_filename_hint (Lisp_Object spec, char hint_buffer[MaxTextExtent]) 10722imagemagick_filename_hint (Lisp_Object spec, char hint_buffer[MaxTextExtent])
10723{ 10723{
10724 Lisp_Object symbol = intern ("image-format-suffixes"); 10724 Lisp_Object symbol = Qimage_format_suffixes;
10725 Lisp_Object val = find_symbol_value (symbol); 10725 Lisp_Object val = find_symbol_value (symbol);
10726 Lisp_Object format; 10726 Lisp_Object format;
10727 10727
10728 if (! CONSP (val)) 10728 if (! CONSP (val))
10729 return NULL; 10729 return NULL;
10730 10730
10731 format = image_spec_value (spec, intern (":format"), NULL); 10731 format = image_spec_value (spec, QCformat, NULL);
10732 val = Fcar_safe (Fcdr_safe (Fassq (format, val))); 10732 val = Fcar_safe (Fcdr_safe (Fassq (format, val)));
10733 if (! STRINGP (val)) 10733 if (! STRINGP (val))
10734 return NULL; 10734 return NULL;
@@ -12477,7 +12477,7 @@ gs_load (struct frame *f, struct image *img)
12477 XSETFRAME (frame, f); 12477 XSETFRAME (frame, f);
12478 loader = image_spec_value (img->spec, QCloader, NULL); 12478 loader = image_spec_value (img->spec, QCloader, NULL);
12479 if (NILP (loader)) 12479 if (NILP (loader))
12480 loader = intern ("gs-load-image"); 12480 loader = Qgs_load_image;
12481 12481
12482 img->lisp_data = call6 (loader, frame, img->spec, 12482 img->lisp_data = call6 (loader, frame, img->spec,
12483 make_fixnum (img->width), 12483 make_fixnum (img->width),
@@ -12853,6 +12853,7 @@ non-numeric, there is no explicit limit on the size of images. */);
12853 DEFSYM (QCloader, ":loader"); 12853 DEFSYM (QCloader, ":loader");
12854 DEFSYM (QCpt_width, ":pt-width"); 12854 DEFSYM (QCpt_width, ":pt-width");
12855 DEFSYM (QCpt_height, ":pt-height"); 12855 DEFSYM (QCpt_height, ":pt-height");
12856 DEFSYM (Qgs_load_image, "gs-load-image");
12856#endif /* HAVE_GHOSTSCRIPT */ 12857#endif /* HAVE_GHOSTSCRIPT */
12857 12858
12858#ifdef HAVE_NTGUI 12859#ifdef HAVE_NTGUI
@@ -13032,5 +13033,8 @@ The options are:
13032*/); 13033*/);
13033 /* MagickExportImagePixels is in 6.4.6-9, but not 6.4.4-10. */ 13034 /* MagickExportImagePixels is in 6.4.6-9, but not 6.4.4-10. */
13034 imagemagick_render_type = 0; 13035 imagemagick_render_type = 0;
13035#endif 13036
13037 DEFSYM (Qimage_format_suffixes, "image-format-suffixes");
13038 DEFSYM (QCformat, ":format");
13039#endif /* HAVE_IMAGEMAGICK */
13036} 13040}
diff --git a/src/keyboard.c b/src/keyboard.c
index 69d29ededc0..bd1bb3bb4be 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1646,7 +1646,7 @@ command_loop_1 (void)
1646 } 1646 }
1647 1647
1648 if (current_buffer != prev_buffer || MODIFF != prev_modiff) 1648 if (current_buffer != prev_buffer || MODIFF != prev_modiff)
1649 run_hook (intern ("activate-mark-hook")); 1649 run_hook (Qactivate_mark_hook);
1650 } 1650 }
1651 1651
1652 Vsaved_region_selection = Qnil; 1652 Vsaved_region_selection = Qnil;
@@ -3077,7 +3077,7 @@ read_char (int commandflag, Lisp_Object map,
3077 3077
3078#ifdef HAVE_NS 3078#ifdef HAVE_NS
3079 if (CONSP (c) 3079 if (CONSP (c)
3080 && (EQ (XCAR (c), intern ("ns-unput-working-text")))) 3080 && (EQ (XCAR (c), Qns_unput_working_text)))
3081 input_was_pending = input_pending; 3081 input_was_pending = input_pending;
3082#endif 3082#endif
3083 3083
@@ -4603,7 +4603,7 @@ timer_start_idle (void)
4603 timer_last_idleness_start_time = timer_idleness_start_time; 4603 timer_last_idleness_start_time = timer_idleness_start_time;
4604 4604
4605 /* Mark all idle-time timers as once again candidates for running. */ 4605 /* Mark all idle-time timers as once again candidates for running. */
4606 call0 (intern ("internal-timer-start-idle")); 4606 call0 (Qinternal_timer_start_idle);
4607} 4607}
4608 4608
4609/* Record that Emacs is no longer idle, so stop running idle-time timers. */ 4609/* Record that Emacs is no longer idle, so stop running idle-time timers. */
@@ -10129,7 +10129,7 @@ read_char_minibuf_menu_prompt (int commandflag,
10129 } 10129 }
10130 10130
10131 /* Prompt with that and read response. */ 10131 /* Prompt with that and read response. */
10132 message3_nolog (apply1 (intern ("concat"), Fnreverse (menu_strings))); 10132 message3_nolog (apply1 (Qconcat, Fnreverse (menu_strings)));
10133 10133
10134 /* Make believe it's not a keyboard macro in case the help char 10134 /* Make believe it's not a keyboard macro in case the help char
10135 is pressed. Help characters are not recorded because menu prompting 10135 is pressed. Help characters are not recorded because menu prompting
@@ -11906,7 +11906,7 @@ On such systems, Emacs starts a subshell instead of suspending. */)
11906 if (!NILP (stuffstring)) 11906 if (!NILP (stuffstring))
11907 CHECK_STRING (stuffstring); 11907 CHECK_STRING (stuffstring);
11908 11908
11909 run_hook (intern ("suspend-hook")); 11909 run_hook (Qsuspend_hook);
11910 11910
11911 get_tty_size (fileno (CURTTY ()->input), &old_width, &old_height); 11911 get_tty_size (fileno (CURTTY ()->input), &old_width, &old_height);
11912 reset_all_sys_modes (); 11912 reset_all_sys_modes ();
@@ -11927,7 +11927,7 @@ On such systems, Emacs starts a subshell instead of suspending. */)
11927 if (width != old_width || height != old_height) 11927 if (width != old_width || height != old_height)
11928 change_frame_size (SELECTED_FRAME (), width, height, false, false, false); 11928 change_frame_size (SELECTED_FRAME (), width, height, false, false, false);
11929 11929
11930 run_hook (intern ("suspend-resume-hook")); 11930 run_hook (Qsuspend_resume_hook);
11931 11931
11932 return Qnil; 11932 return Qnil;
11933} 11933}
@@ -13702,7 +13702,7 @@ you could say something like:
13702 13702
13703Also see `set-message-function' (which controls how non-error messages 13703Also see `set-message-function' (which controls how non-error messages
13704are displayed). */); 13704are displayed). */);
13705 Vcommand_error_function = intern ("command-error-default-function"); 13705 Vcommand_error_function = Qcommand_error_default_function;
13706 13706
13707 DEFVAR_LISP ("enable-disabled-menus-and-buttons", 13707 DEFVAR_LISP ("enable-disabled-menus-and-buttons",
13708 Venable_disabled_menus_and_buttons, 13708 Venable_disabled_menus_and_buttons,
@@ -13752,7 +13752,7 @@ of processing the event normally through `special-event-map'.
13752 13752
13753Currently, the only supported values for this 13753Currently, the only supported values for this
13754variable are `sigusr1' and `sigusr2'. */); 13754variable are `sigusr1' and `sigusr2'. */);
13755 Vdebug_on_event = intern_c_string ("sigusr2"); 13755 Vdebug_on_event = Qsigusr2;
13756 13756
13757 DEFVAR_BOOL ("attempt-stack-overflow-recovery", 13757 DEFVAR_BOOL ("attempt-stack-overflow-recovery",
13758 attempt_stack_overflow_recovery, 13758 attempt_stack_overflow_recovery,
@@ -13854,6 +13854,15 @@ function is called to remap that sequence. */);
13854 DEFSYM (Qcurrent_key_remap_sequence, "current-key-remap-sequence"); 13854 DEFSYM (Qcurrent_key_remap_sequence, "current-key-remap-sequence");
13855 13855
13856 pdumper_do_now_and_after_load (syms_of_keyboard_for_pdumper); 13856 pdumper_do_now_and_after_load (syms_of_keyboard_for_pdumper);
13857
13858 DEFSYM (Qactivate_mark_hook, "activate-mark-hook");
13859 DEFSYM (Qns_unput_working_text, "ns-unput-working-text");
13860 DEFSYM (Qinternal_timer_start_idle, "internal-timer-start-idle");
13861 DEFSYM (Qconcat, "concat");
13862 DEFSYM (Qsuspend_hook, "suspend-hook");
13863 DEFSYM (Qsuspend_resume_hook, "suspend-resume-hook");
13864 DEFSYM (Qcommand_error_default_function, "command-error-default-function");
13865 DEFSYM (Qsigusr2, "sigusr2");
13857} 13866}
13858 13867
13859static void 13868static void
diff --git a/src/keymap.c b/src/keymap.c
index b9d8d18931d..0f50d804dff 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -642,7 +642,7 @@ usage: (map-keymap FUNCTION KEYMAP) */)
642 (Lisp_Object function, Lisp_Object keymap, Lisp_Object sort_first) 642 (Lisp_Object function, Lisp_Object keymap, Lisp_Object sort_first)
643{ 643{
644 if (! NILP (sort_first)) 644 if (! NILP (sort_first))
645 return call2 (intern ("map-keymap-sorted"), function, keymap); 645 return call2 (Qmap_keymap_sorted, function, keymap);
646 646
647 map_keymap (keymap, map_keymap_call, function, NULL, 1); 647 map_keymap (keymap, map_keymap_call, function, NULL, 1);
648 return Qnil; 648 return Qnil;
@@ -1334,7 +1334,7 @@ recognize the default bindings, just as `read-key-sequence' does. */)
1334 /* Initialize the unicode case table, if it wasn't already. */ 1334 /* Initialize the unicode case table, if it wasn't already. */
1335 if (NILP (unicode_case_table)) 1335 if (NILP (unicode_case_table))
1336 { 1336 {
1337 unicode_case_table = uniprop_table (intern ("lowercase")); 1337 unicode_case_table = uniprop_table (Qlowercase);
1338 /* uni-lowercase.el might be unavailable during bootstrap. */ 1338 /* uni-lowercase.el might be unavailable during bootstrap. */
1339 if (NILP (unicode_case_table)) 1339 if (NILP (unicode_case_table))
1340 return found; 1340 return found;
@@ -3053,7 +3053,7 @@ DESCRIBER is the output function used; nil means use `princ'. */)
3053{ 3053{
3054 specpdl_ref count = SPECPDL_INDEX (); 3054 specpdl_ref count = SPECPDL_INDEX ();
3055 if (NILP (describer)) 3055 if (NILP (describer))
3056 describer = intern ("princ"); 3056 describer = Qprinc;
3057 specbind (Qstandard_output, Fcurrent_buffer ()); 3057 specbind (Qstandard_output, Fcurrent_buffer ());
3058 CHECK_VECTOR_OR_CHAR_TABLE (vector); 3058 CHECK_VECTOR_OR_CHAR_TABLE (vector);
3059 describe_vector (vector, Qnil, describer, describe_vector_princ, 0, 3059 describe_vector (vector, Qnil, describer, describe_vector_princ, 0,
@@ -3169,7 +3169,7 @@ describe_vector (Lisp_Object vector, Lisp_Object prefix, Lisp_Object args,
3169 Lisp_Object kludge = make_nil_vector (1); 3169 Lisp_Object kludge = make_nil_vector (1);
3170 3170
3171 if (partial) 3171 if (partial)
3172 suppress = intern ("suppress-keymap"); 3172 suppress = Qsuppress_keymap;
3173 3173
3174 /* STOP is a boundary between normal characters (-#x3FFF7F) and 3174 /* STOP is a boundary between normal characters (-#x3FFF7F) and
3175 8-bit characters (#x3FFF80-), used below when VECTOR is a 3175 8-bit characters (#x3FFF80-), used below when VECTOR is a
@@ -3342,6 +3342,7 @@ syms_of_keymap (void)
3342{ 3342{
3343 DEFSYM (Qkeymap, "keymap"); 3343 DEFSYM (Qkeymap, "keymap");
3344 DEFSYM (Qhelp__describe_map_tree, "help--describe-map-tree"); 3344 DEFSYM (Qhelp__describe_map_tree, "help--describe-map-tree");
3345 DEFSYM (Qmap_keymap_sorted, "map-keymap-sorted");
3345 3346
3346 DEFSYM (Qkeymap_canonicalize, "keymap-canonicalize"); 3347 DEFSYM (Qkeymap_canonicalize, "keymap-canonicalize");
3347 3348
@@ -3485,6 +3486,7 @@ that describe key bindings. That is why the default is nil. */);
3485 3486
3486 DEFSYM (Qkey_parse, "key-parse"); 3487 DEFSYM (Qkey_parse, "key-parse");
3487 DEFSYM (Qkey_valid_p, "key-valid-p"); 3488 DEFSYM (Qkey_valid_p, "key-valid-p");
3488
3489 DEFSYM (Qnon_key_event, "non-key-event"); 3489 DEFSYM (Qnon_key_event, "non-key-event");
3490 DEFSYM (Qprinc, "princ");
3491 DEFSYM (Qsuppress_keymap, "suppress-keymap");
3490} 3492}
diff --git a/src/lread.c b/src/lread.c
index d0067fb974b..c92b2ede932 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -2741,7 +2741,7 @@ STREAM or the value of `standard-input' may be:
2741 minibuffer without a stream, as in (read). But is this feature 2741 minibuffer without a stream, as in (read). But is this feature
2742 ever used, and if so, why? IOW, will anything break if this 2742 ever used, and if so, why? IOW, will anything break if this
2743 feature is removed !? */ 2743 feature is removed !? */
2744 return call1 (intern ("read-minibuffer"), 2744 return call1 (Qread_minibuffer,
2745 build_string ("Lisp expression: ")); 2745 build_string ("Lisp expression: "));
2746 2746
2747 return read_internal_start (stream, Qnil, Qnil, false); 2747 return read_internal_start (stream, Qnil, Qnil, false);
@@ -2769,7 +2769,7 @@ STREAM or the value of `standard-input' may be:
2769 stream = Qread_char; 2769 stream = Qread_char;
2770 if (EQ (stream, Qread_char)) 2770 if (EQ (stream, Qread_char))
2771 /* FIXME: ?! When is this used !? */ 2771 /* FIXME: ?! When is this used !? */
2772 return call1 (intern ("read-minibuffer"), 2772 return call1 (Qread_minibuffer,
2773 build_string ("Lisp expression: ")); 2773 build_string ("Lisp expression: "));
2774 2774
2775 return read_internal_start (stream, Qnil, Qnil, true); 2775 return read_internal_start (stream, Qnil, Qnil, true);
@@ -6218,4 +6218,5 @@ Only valid during macro-expansion. Internal use only. */);
6218 6218
6219 DEFSYM (Qinternal_macroexpand_for_load, 6219 DEFSYM (Qinternal_macroexpand_for_load,
6220 "internal-macroexpand-for-load"); 6220 "internal-macroexpand-for-load");
6221 DEFSYM (Qread_minibuffer, "read-minibuffer");
6221} 6222}
diff --git a/src/minibuf.c b/src/minibuf.c
index 1029fcdb1ba..86877badd2a 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -494,12 +494,11 @@ confirm the aborting of the current minibuffer and all contained ones. */)
494 to abort any extra non-minibuffer recursive edits. Thus, 494 to abort any extra non-minibuffer recursive edits. Thus,
495 the number of recursive edits we have to abort equals the 495 the number of recursive edits we have to abort equals the
496 number of minibuffers we have to abort. */ 496 number of minibuffers we have to abort. */
497 CALLN (Ffuncall, intern ("minibuffer-quit-recursive-edit"), 497 call1 (Qminibuffer_quit_recursive_edit, array[1]);
498 array[1]);
499 } 498 }
500 } 499 }
501 else 500 else
502 CALLN (Ffuncall, intern ("minibuffer-quit-recursive-edit")); 501 call0 (Qminibuffer_quit_recursive_edit);
503 return Qnil; 502 return Qnil;
504} 503}
505 504
@@ -1544,7 +1543,7 @@ function, instead of the usual behavior. */)
1544 CONSP (def) ? XCAR (def) : def); 1543 CONSP (def) ? XCAR (def) : def);
1545 } 1544 }
1546 1545
1547 result = Fcompleting_read (prompt, intern ("internal-complete-buffer"), 1546 result = Fcompleting_read (prompt, Qinternal_complete_buffer,
1548 predicate, require_match, Qnil, 1547 predicate, require_match, Qnil,
1549 Qbuffer_name_history, def, Qnil); 1548 Qbuffer_name_history, def, Qnil);
1550 } 1549 }
@@ -2032,7 +2031,7 @@ See also `completing-read-function'. */)
2032 (Lisp_Object prompt, Lisp_Object collection, Lisp_Object predicate, Lisp_Object require_match, Lisp_Object initial_input, Lisp_Object hist, Lisp_Object def, Lisp_Object inherit_input_method) 2031 (Lisp_Object prompt, Lisp_Object collection, Lisp_Object predicate, Lisp_Object require_match, Lisp_Object initial_input, Lisp_Object hist, Lisp_Object def, Lisp_Object inherit_input_method)
2033{ 2032{
2034 return CALLN (Ffuncall, 2033 return CALLN (Ffuncall,
2035 Fsymbol_value (intern ("completing-read-function")), 2034 Fsymbol_value (Qcompleting_read_function),
2036 prompt, collection, predicate, require_match, initial_input, 2035 prompt, collection, predicate, require_match, initial_input,
2037 hist, def, inherit_input_method); 2036 hist, def, inherit_input_method);
2038} 2037}
@@ -2531,4 +2530,7 @@ showing the *Completions* buffer, if any. */);
2531 defsubr (&Stest_completion); 2530 defsubr (&Stest_completion);
2532 defsubr (&Sassoc_string); 2531 defsubr (&Sassoc_string);
2533 defsubr (&Scompleting_read); 2532 defsubr (&Scompleting_read);
2533 DEFSYM (Qminibuffer_quit_recursive_edit, "minibuffer-quit-recursive-edit");
2534 DEFSYM (Qinternal_complete_buffer, "internal-complete-buffer");
2535 DEFSYM (Qcompleting_read_function, "completing-read-function");
2534} 2536}
diff --git a/src/msdos.c b/src/msdos.c
index 7e78c35027e..e9faa48fa70 100644
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -3070,12 +3070,12 @@ XMenuActivate (Display *foo, XMenu *menu, int *pane, int *selidx,
3070 state = alloca (menu->panecount * sizeof (struct IT_menu_state)); 3070 state = alloca (menu->panecount * sizeof (struct IT_menu_state));
3071 screensize = screen_size * 2; 3071 screensize = screen_size * 2;
3072 faces[0] 3072 faces[0]
3073 = lookup_derived_face (NULL, sf, intern ("msdos-menu-passive-face"), 3073 = lookup_derived_face (NULL, sf, Qmsdos_menu_passive_face,
3074 DEFAULT_FACE_ID, 1); 3074 DEFAULT_FACE_ID, 1);
3075 faces[1] 3075 faces[1]
3076 = lookup_derived_face (NULL, sf, intern ("msdos-menu-active-face"), 3076 = lookup_derived_face (NULL, sf, Qmsdos_menu_active_face,
3077 DEFAULT_FACE_ID, 1); 3077 DEFAULT_FACE_ID, 1);
3078 selectface = intern ("msdos-menu-select-face"); 3078 selectface = Qmsdos_menu_select_face;
3079 faces[2] = lookup_derived_face (NULL, sf, selectface, 3079 faces[2] = lookup_derived_face (NULL, sf, selectface,
3080 faces[0], 1); 3080 faces[0], 1);
3081 faces[3] = lookup_derived_face (NULL, sf, selectface, 3081 faces[3] = lookup_derived_face (NULL, sf, selectface,
@@ -3740,7 +3740,7 @@ run_msdos_command (char **argv, const char *working_dir,
3740 *pl = '\0'; 3740 *pl = '\0';
3741 3741
3742 cmd = Ffile_name_nondirectory (build_string (lowcase_argv0)); 3742 cmd = Ffile_name_nondirectory (build_string (lowcase_argv0));
3743 msshell = !NILP (Fmember (cmd, Fsymbol_value (intern ("msdos-shells")))) 3743 msshell = !NILP (Fmember (cmd, Fsymbol_value (Qmsdos_shells)))
3744 && !strcmp ("-c", argv[1]); 3744 && !strcmp ("-c", argv[1]);
3745 if (msshell) 3745 if (msshell)
3746 { 3746 {
@@ -4324,6 +4324,11 @@ This variable is used only by MS-DOS terminals. */);
4324 defsubr (&Smsdos_downcase_filename); 4324 defsubr (&Smsdos_downcase_filename);
4325 defsubr (&Smsdos_remember_default_colors); 4325 defsubr (&Smsdos_remember_default_colors);
4326 defsubr (&Smsdos_set_mouse_buttons); 4326 defsubr (&Smsdos_set_mouse_buttons);
4327
4328 DEFSYM (Qmsdos_menu_passive_face, "msdos-menu-passive-face");
4329 DEFSYM (Qmsdos_menu_active_face, "msdos-menu-active-face");
4330 DEFSYM (Qmsdos_menu_select_face, "msdos-menu-select-face");
4331 DEFSYM (Qmsdos_shells, "msdos-shells");
4327} 4332}
4328 4333
4329#endif /* MSDOS */ 4334#endif /* MSDOS */
diff --git a/src/nsfns.m b/src/nsfns.m
index c521140bd68..b08d053610f 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -2046,12 +2046,12 @@ DEFUN ("x-display-backing-store", Fx_display_backing_store,
2046 switch ([ns_get_window (terminal) backingType]) 2046 switch ([ns_get_window (terminal) backingType])
2047 { 2047 {
2048 case NSBackingStoreBuffered: 2048 case NSBackingStoreBuffered:
2049 return intern ("buffered"); 2049 return Qbuffered;
2050#if defined (NS_IMPL_GNUSTEP) || MAC_OS_X_VERSION_MIN_REQUIRED < 101300 2050#if defined (NS_IMPL_GNUSTEP) || MAC_OS_X_VERSION_MIN_REQUIRED < 101300
2051 case NSBackingStoreRetained: 2051 case NSBackingStoreRetained:
2052 return intern ("retained"); 2052 return Qretained;
2053 case NSBackingStoreNonretained: 2053 case NSBackingStoreNonretained:
2054 return intern ("non-retained"); 2054 return Qnon_retained;
2055#endif 2055#endif
2056 default: 2056 default:
2057 error ("Strange value for backingType parameter of frame"); 2057 error ("Strange value for backingType parameter of frame");
@@ -2071,19 +2071,19 @@ DEFUN ("x-display-visual-class", Fx_display_visual_class,
2071 depth = [[[NSScreen screens] objectAtIndex:0] depth]; 2071 depth = [[[NSScreen screens] objectAtIndex:0] depth];
2072 2072
2073 if ( depth == NSBestDepth (NSCalibratedWhiteColorSpace, 2, 2, YES, NULL)) 2073 if ( depth == NSBestDepth (NSCalibratedWhiteColorSpace, 2, 2, YES, NULL))
2074 return intern ("static-gray"); 2074 return Qstatic_gray;
2075 else if (depth == NSBestDepth (NSCalibratedWhiteColorSpace, 8, 8, YES, NULL)) 2075 else if (depth == NSBestDepth (NSCalibratedWhiteColorSpace, 8, 8, YES, NULL))
2076 return intern ("gray-scale"); 2076 return Qgray_scale;
2077 else if ( depth == NSBestDepth (NSCalibratedRGBColorSpace, 8, 8, YES, NULL)) 2077 else if ( depth == NSBestDepth (NSCalibratedRGBColorSpace, 8, 8, YES, NULL))
2078 return intern ("pseudo-color"); 2078 return Qpseudo_color;
2079 else if ( depth == NSBestDepth (NSCalibratedRGBColorSpace, 4, 12, NO, NULL)) 2079 else if ( depth == NSBestDepth (NSCalibratedRGBColorSpace, 4, 12, NO, NULL))
2080 return intern ("true-color"); 2080 return Qtrue_color;
2081 else if ( depth == NSBestDepth (NSCalibratedRGBColorSpace, 8, 24, NO, NULL)) 2081 else if ( depth == NSBestDepth (NSCalibratedRGBColorSpace, 8, 24, NO, NULL))
2082 return intern ("direct-color"); 2082 return Qdirect_color;
2083 else 2083 else
2084 /* Color management as far as we do it is really handled by 2084 /* Color management as far as we do it is really handled by
2085 Nextstep itself anyway. */ 2085 Nextstep itself anyway. */
2086 return intern ("direct-color"); 2086 return Qdirect_color;
2087} 2087}
2088 2088
2089 2089
@@ -2183,13 +2183,13 @@ is layered in front of the windows of other applications. */)
2183 (Lisp_Object on) 2183 (Lisp_Object on)
2184{ 2184{
2185 check_window_system (NULL); 2185 check_window_system (NULL);
2186 if (EQ (on, intern ("activate"))) 2186 if (EQ (on, Qactivate))
2187 { 2187 {
2188 [NSApp unhide: NSApp]; 2188 [NSApp unhide: NSApp];
2189 [NSApp activateIgnoringOtherApps: YES]; 2189 [NSApp activateIgnoringOtherApps: YES];
2190 } 2190 }
2191#if GNUSTEP_GUI_MAJOR_VERSION > 0 || GNUSTEP_GUI_MINOR_VERSION >= 27 2191#if GNUSTEP_GUI_MAJOR_VERSION > 0 || GNUSTEP_GUI_MINOR_VERSION >= 27
2192 else if (EQ (on, intern ("activate-front"))) 2192 else if (EQ (on, Qactivate_front))
2193 { 2193 {
2194 [NSApp unhide: NSApp]; 2194 [NSApp unhide: NSApp];
2195 [[NSRunningApplication currentApplication] 2195 [[NSRunningApplication currentApplication]
@@ -2530,7 +2530,7 @@ DEFUN ("system-move-file-to-trash", Fsystem_move_file_to_trash,
2530 if (!NILP (Ffile_directory_p (filename)) 2530 if (!NILP (Ffile_directory_p (filename))
2531 && NILP (Ffile_symlink_p (filename))) 2531 && NILP (Ffile_symlink_p (filename)))
2532 { 2532 {
2533 operation = intern ("delete-directory"); 2533 operation = Qdelete_directory;
2534 filename = Fdirectory_file_name (filename); 2534 filename = Fdirectory_file_name (filename);
2535 } 2535 }
2536 2536
@@ -3149,7 +3149,7 @@ ns_create_tip_frame (struct ns_display_info *dpyinfo, Lisp_Object parms)
3149 3149
3150 /* Set the `display-type' frame parameter before setting up faces. */ 3150 /* Set the `display-type' frame parameter before setting up faces. */
3151 { 3151 {
3152 Lisp_Object disptype = intern ("color"); 3152 Lisp_Object disptype = Qcolor;
3153 3153
3154 if (NILP (Fframe_parameter (frame, Qdisplay_type))) 3154 if (NILP (Fframe_parameter (frame, Qdisplay_type)))
3155 { 3155 {
@@ -3208,7 +3208,7 @@ x_hide_tip (bool delete)
3208{ 3208{
3209 if (!NILP (tip_timer)) 3209 if (!NILP (tip_timer))
3210 { 3210 {
3211 call1 (intern ("cancel-timer"), tip_timer); 3211 call1 (Qcancel_timer, tip_timer);
3212 tip_timer = Qnil; 3212 tip_timer = Qnil;
3213 } 3213 }
3214 3214
@@ -3359,7 +3359,7 @@ DEFUN ("x-show-tip", Fx_show_tip, Sx_show_tip, 1, 6, 0,
3359 tip_f = XFRAME (tip_frame); 3359 tip_f = XFRAME (tip_frame);
3360 if (!NILP (tip_timer)) 3360 if (!NILP (tip_timer))
3361 { 3361 {
3362 call1 (intern ("cancel-timer"), tip_timer); 3362 call1 (Qcancel_timer, tip_timer);
3363 tip_timer = Qnil; 3363 tip_timer = Qnil;
3364 } 3364 }
3365 3365
@@ -3406,12 +3406,12 @@ DEFUN ("x-show-tip", Fx_show_tip, Sx_show_tip, 1, 6, 0,
3406 break; 3406 break;
3407 } 3407 }
3408 else 3408 else
3409 tip_last_parms = 3409 tip_last_parms
3410 call2 (intern ("assq-delete-all"), parm, tip_last_parms); 3410 = call2 (Qassq_delete_all, parm, tip_last_parms);
3411 } 3411 }
3412 else 3412 else
3413 tip_last_parms = 3413 tip_last_parms
3414 call2 (intern ("assq-delete-all"), parm, tip_last_parms); 3414 = call2 (Qassq_delete_all, parm, tip_last_parms);
3415 } 3415 }
3416 3416
3417 /* Now check if every parameter in what is left of 3417 /* Now check if every parameter in what is left of
@@ -3573,8 +3573,8 @@ DEFUN ("x-show-tip", Fx_show_tip, Sx_show_tip, 1, 6, 0,
3573 3573
3574 start_timer: 3574 start_timer:
3575 /* Let the tip disappear after timeout seconds. */ 3575 /* Let the tip disappear after timeout seconds. */
3576 tip_timer = call3 (intern ("run-at-time"), timeout, Qnil, 3576 tip_timer = call3 (Qrun_at_time, timeout, Qnil,
3577 intern ("x-hide-tip")); 3577 Qx_hide_tip);
3578 } 3578 }
3579 3579
3580 return unbind_to (count, Qnil); 3580 return unbind_to (count, Qnil);
@@ -4076,4 +4076,20 @@ The default value is t. */);
4076 as_script = Qnil; 4076 as_script = Qnil;
4077 staticpro (&as_script); 4077 staticpro (&as_script);
4078 as_result = 0; 4078 as_result = 0;
4079
4080 DEFSYM (Qbuffered, "buffered");
4081 DEFSYM (Qretained, "retained");
4082 DEFSYM (Qnon_retained, "non-retained");
4083 DEFSYM (Qstatic_gray, "static-gray");
4084 DEFSYM (Qgray_scale, "gray-scale");
4085 DEFSYM (Qpseudo_color, "pseudo-color");
4086 DEFSYM (Qtrue_color, "true-color");
4087 DEFSYM (Qdirect_color, "direct-color");
4088 DEFSYM (Qactivate, "activate");
4089 DEFSYM (Qactivate_front, "activate-front");
4090 DEFSYM (Qcolor, "color");
4091 DEFSYM (Qcancel_timer, "cancel-timer");
4092 DEFSYM (Qassq_delete_all, "assq-delete-all");
4093 DEFSYM (Qrun_at_time, "run-at-time");
4094 DEFSYM (Qx_hide_tip, "x-hide-tip");
4079} 4095}
diff --git a/src/nsfont.m b/src/nsfont.m
index e1b1b097c17..ddbaea11967 100644
--- a/src/nsfont.m
+++ b/src/nsfont.m
@@ -337,8 +337,8 @@ ns_spec_to_descriptor (Lisp_Object font_spec)
337 if (EQ (tem, Qitalic) || EQ (tem, Qoblique)) 337 if (EQ (tem, Qitalic) || EQ (tem, Qoblique))
338 [tdict setObject: [NSNumber numberWithFloat: 1.0] 338 [tdict setObject: [NSNumber numberWithFloat: 1.0]
339 forKey: NSFontSlantTrait]; 339 forKey: NSFontSlantTrait];
340 else if (EQ (tem, intern ("reverse-italic")) 340 else if (EQ (tem, Qreverse_italic)
341 || EQ (tem, intern ("reverse-oblique"))) 341 || EQ (tem, Qreverse_oblique))
342 [tdict setObject: [NSNumber numberWithFloat: -1.0] 342 [tdict setObject: [NSNumber numberWithFloat: -1.0]
343 forKey: NSFontSlantTrait]; 343 forKey: NSFontSlantTrait];
344 else 344 else
@@ -451,7 +451,7 @@ ns_descriptor_to_entity (NSFontDescriptor *desc,
451 FONT_SET_STYLE (font_entity, FONT_SLANT_INDEX, 451 FONT_SET_STYLE (font_entity, FONT_SLANT_INDEX,
452 data.slant == GS_FONT_SLANT_ITALIC 452 data.slant == GS_FONT_SLANT_ITALIC
453 ? Qitalic : (data.slant == GS_FONT_SLANT_REVERSE_ITALIC 453 ? Qitalic : (data.slant == GS_FONT_SLANT_REVERSE_ITALIC
454 ? intern ("reverse-italic") : Qnormal)); 454 ? Qreverse_italic : Qnormal));
455 } 455 }
456 else 456 else
457 FONT_SET_STYLE (font_entity, FONT_SLANT_INDEX, Qnormal); 457 FONT_SET_STYLE (font_entity, FONT_SLANT_INDEX, Qnormal);
@@ -461,7 +461,7 @@ ns_descriptor_to_entity (NSFontDescriptor *desc,
461 FONT_SET_STYLE (font_entity, FONT_WIDTH_INDEX, 461 FONT_SET_STYLE (font_entity, FONT_WIDTH_INDEX,
462 data.width == GS_FONT_WIDTH_CONDENSED 462 data.width == GS_FONT_WIDTH_CONDENSED
463 ? Qcondensed : (data.width == GS_FONT_WIDTH_EXPANDED 463 ? Qcondensed : (data.width == GS_FONT_WIDTH_EXPANDED
464 ? intern ("expanded") : Qnormal)); 464 ? Qexpanded : Qnormal));
465 } 465 }
466 else 466 else
467 FONT_SET_STYLE (font_entity, FONT_WIDTH_INDEX, Qnormal); 467 FONT_SET_STYLE (font_entity, FONT_WIDTH_INDEX, Qnormal);
@@ -1744,7 +1744,6 @@ void
1744syms_of_nsfont (void) 1744syms_of_nsfont (void)
1745{ 1745{
1746 DEFSYM (Qcondensed, "condensed"); 1746 DEFSYM (Qcondensed, "condensed");
1747 DEFSYM (Qexpanded, "expanded");
1748 DEFSYM (Qmedium, "medium"); 1747 DEFSYM (Qmedium, "medium");
1749 1748
1750 DEFVAR_LISP ("ns-reg-to-script", Vns_reg_to_script, 1749 DEFVAR_LISP ("ns-reg-to-script", Vns_reg_to_script,
@@ -1752,6 +1751,11 @@ syms_of_nsfont (void)
1752 Vns_reg_to_script = Qnil; 1751 Vns_reg_to_script = Qnil;
1753 1752
1754 pdumper_do_now_and_after_load (syms_of_nsfont_for_pdumper); 1753 pdumper_do_now_and_after_load (syms_of_nsfont_for_pdumper);
1754
1755 /* Font slant styles. */
1756 DEFSYM (Qreverse_italic, "reverse-italic");
1757 DEFSYM (Qreverse_oblique, "reverse-oblique");
1758 DEFSYM (Qexpanded, "expanded");
1755} 1759}
1756 1760
1757static void 1761static void
diff --git a/src/pdumper.c b/src/pdumper.c
index 65da3feff75..3806953f2c2 100644
--- a/src/pdumper.c
+++ b/src/pdumper.c
@@ -4156,7 +4156,7 @@ types. */)
4156 /* Bind `command-line-processed' to nil before dumping, 4156 /* Bind `command-line-processed' to nil before dumping,
4157 so that the dumped Emacs will process its command line 4157 so that the dumped Emacs will process its command line
4158 and set up to work with X windows if appropriate. */ 4158 and set up to work with X windows if appropriate. */
4159 Lisp_Object symbol = intern ("command-line-processed"); 4159 Lisp_Object symbol = Qcommand_line_processed;
4160 specbind (symbol, Qnil); 4160 specbind (symbol, Qnil);
4161 4161
4162 CHECK_STRING (filename); 4162 CHECK_STRING (filename);
diff --git a/src/pgtkfns.c b/src/pgtkfns.c
index f43eed6ad23..6a8efb6d0bf 100644
--- a/src/pgtkfns.c
+++ b/src/pgtkfns.c
@@ -2148,7 +2148,7 @@ If omitted or nil, that stands for the selected frame's display.
2148On PGTK, always return true-color. */) 2148On PGTK, always return true-color. */)
2149 (Lisp_Object terminal) 2149 (Lisp_Object terminal)
2150{ 2150{
2151 return intern ("true-color"); 2151 return Qtrue_color;
2152} 2152}
2153 2153
2154 2154
@@ -2844,7 +2844,7 @@ x_create_tip_frame (struct pgtk_display_info *dpyinfo, Lisp_Object parms, struct
2844 { 2844 {
2845 Lisp_Object disptype; 2845 Lisp_Object disptype;
2846 2846
2847 disptype = intern ("color"); 2847 disptype = Qcolor;
2848 2848
2849 if (NILP (Fframe_parameter (frame, Qdisplay_type))) 2849 if (NILP (Fframe_parameter (frame, Qdisplay_type)))
2850 { 2850 {
@@ -3391,8 +3391,7 @@ Text larger than the specified size is clipped. */)
3391 3391
3392 start_timer: 3392 start_timer:
3393 /* Let the tip disappear after timeout seconds. */ 3393 /* Let the tip disappear after timeout seconds. */
3394 tip_timer = call3 (intern ("run-at-time"), timeout, Qnil, 3394 tip_timer = call3 (Qrun_at_time, timeout, Qnil, Qx_hide_tip);
3395 intern ("x-hide-tip"));
3396 3395
3397 return unbind_to (count, Qnil); 3396 return unbind_to (count, Qnil);
3398} 3397}
@@ -3967,4 +3966,8 @@ syms_of_pgtkfns (void)
3967 DEFSYM (Qlandscape, "landscape"); 3966 DEFSYM (Qlandscape, "landscape");
3968 DEFSYM (Qreverse_portrait, "reverse-portrait"); 3967 DEFSYM (Qreverse_portrait, "reverse-portrait");
3969 DEFSYM (Qreverse_landscape, "reverse-landscape"); 3968 DEFSYM (Qreverse_landscape, "reverse-landscape");
3969 DEFSYM (Qtrue_color, "true-color");
3970 DEFSYM (Qcolor, "color");
3971 DEFSYM (Qrun_at_time, "run-at-time");
3972 DEFSYM (Qx_hide_tip, "x-hide-tip");
3970} 3973}
diff --git a/src/pgtkterm.c b/src/pgtkterm.c
index 72bc636485a..8d9a47b932f 100644
--- a/src/pgtkterm.c
+++ b/src/pgtkterm.c
@@ -7182,6 +7182,9 @@ syms_of_pgtkterm (void)
7182 DEFSYM (Qsuper, "super"); 7182 DEFSYM (Qsuper, "super");
7183 DEFSYM (Qcontrol, "control"); 7183 DEFSYM (Qcontrol, "control");
7184 DEFSYM (QUTF8_STRING, "UTF8_STRING"); 7184 DEFSYM (QUTF8_STRING, "UTF8_STRING");
7185 /* Referenced in gtkutil.c. */
7186 DEFSYM (Qtheme_name, "theme-name");
7187 DEFSYM (Qfile_name_sans_extension, "file-name-sans-extension");
7185 7188
7186 DEFSYM (Qfile, "file"); 7189 DEFSYM (Qfile, "file");
7187 DEFSYM (Qurl, "url"); 7190 DEFSYM (Qurl, "url");
@@ -7199,7 +7202,6 @@ syms_of_pgtkterm (void)
7199 DEFSYM (Qlink, "link"); 7202 DEFSYM (Qlink, "link");
7200 DEFSYM (Qprivate, "private"); 7203 DEFSYM (Qprivate, "private");
7201 7204
7202
7203 Fput (Qalt, Qmodifier_value, make_fixnum (alt_modifier)); 7205 Fput (Qalt, Qmodifier_value, make_fixnum (alt_modifier));
7204 Fput (Qhyper, Qmodifier_value, make_fixnum (hyper_modifier)); 7206 Fput (Qhyper, Qmodifier_value, make_fixnum (hyper_modifier));
7205 Fput (Qmeta, Qmodifier_value, make_fixnum (meta_modifier)); 7207 Fput (Qmeta, Qmodifier_value, make_fixnum (meta_modifier));
@@ -7479,5 +7481,5 @@ pgtk_cr_export_frames (Lisp_Object frames, cairo_surface_type_t surface_type)
7479 7481
7480 unbind_to (count, Qnil); 7482 unbind_to (count, Qnil);
7481 7483
7482 return CALLN (Fapply, intern ("concat"), Fnreverse (acc)); 7484 return CALLN (Fapply, Qconcat, Fnreverse (acc));
7483} 7485}
diff --git a/src/term.c b/src/term.c
index 903444ef69f..351b0a4310c 100644
--- a/src/term.c
+++ b/src/term.c
@@ -1416,9 +1416,9 @@ term_get_fkeys_1 (void)
1416 /* Define f0 first, so that f10 takes precedence in case the 1416 /* Define f0 first, so that f10 takes precedence in case the
1417 key sequences happens to be the same. */ 1417 key sequences happens to be the same. */
1418 Fdefine_key (KVAR (kboard, Vinput_decode_map), build_string (k0), 1418 Fdefine_key (KVAR (kboard, Vinput_decode_map), build_string (k0),
1419 make_vector (1, intern ("f0")), Qnil); 1419 make_vector (1, Qf0), Qnil);
1420 Fdefine_key (KVAR (kboard, Vinput_decode_map), build_string (k_semi), 1420 Fdefine_key (KVAR (kboard, Vinput_decode_map), build_string (k_semi),
1421 make_vector (1, intern ("f10")), Qnil); 1421 make_vector (1, Qf10), Qnil);
1422 } 1422 }
1423 else if (k0) 1423 else if (k0)
1424 Fdefine_key (KVAR (kboard, Vinput_decode_map), build_string (k0), 1424 Fdefine_key (KVAR (kboard, Vinput_decode_map), build_string (k0),
@@ -2275,7 +2275,7 @@ set_tty_color_mode (struct tty_display_info *tty, struct frame *f)
2275 tty->previous_color_mode = mode; 2275 tty->previous_color_mode = mode;
2276 tty_setup_colors (tty , mode); 2276 tty_setup_colors (tty , mode);
2277 /* This recomputes all the faces given the new color definitions. */ 2277 /* This recomputes all the faces given the new color definitions. */
2278 safe_calln (intern ("tty-set-up-initial-frame-faces")); 2278 safe_calln (Qtty_set_up_initial_frame_faces);
2279 } 2279 }
2280} 2280}
2281 2281
@@ -2387,7 +2387,7 @@ A suspended tty may be resumed by calling `resume-tty' on it. */)
2387 the tty state. */ 2387 the tty state. */
2388 Lisp_Object term; 2388 Lisp_Object term;
2389 XSETTERMINAL (term, t); 2389 XSETTERMINAL (term, t);
2390 CALLN (Frun_hook_with_args, intern ("suspend-tty-functions"), term); 2390 CALLN (Frun_hook_with_args, Qsuspend_tty_functions, term);
2391 2391
2392 reset_sys_modes (t->display_info.tty); 2392 reset_sys_modes (t->display_info.tty);
2393 delete_keyboard_wait_descriptor (fileno (f)); 2393 delete_keyboard_wait_descriptor (fileno (f));
@@ -2494,7 +2494,7 @@ frame's terminal). */)
2494 /* Run `resume-tty-functions'. */ 2494 /* Run `resume-tty-functions'. */
2495 Lisp_Object term; 2495 Lisp_Object term;
2496 XSETTERMINAL (term, t); 2496 XSETTERMINAL (term, t);
2497 CALLN (Frun_hook_with_args, intern ("resume-tty-functions"), term); 2497 CALLN (Frun_hook_with_args, Qresume_tty_functions, term);
2498 } 2498 }
2499 2499
2500 set_tty_hooks (t); 2500 set_tty_hooks (t);
@@ -3277,10 +3277,10 @@ tty_menu_activate (tty_menu *menu, int *pane, int *selidx,
3277 SAFE_NALLOCA (state, 1, menu->panecount); 3277 SAFE_NALLOCA (state, 1, menu->panecount);
3278 memset (state, 0, sizeof (*state)); 3278 memset (state, 0, sizeof (*state));
3279 faces[0] 3279 faces[0]
3280 = lookup_derived_face (NULL, sf, intern ("tty-menu-disabled-face"), 3280 = lookup_derived_face (NULL, sf, Qtty_menu_disabled_face,
3281 DEFAULT_FACE_ID, 1); 3281 DEFAULT_FACE_ID, 1);
3282 faces[1] 3282 faces[1]
3283 = lookup_derived_face (NULL, sf, intern ("tty-menu-enabled-face"), 3283 = lookup_derived_face (NULL, sf, Qtty_menu_enabled_face,
3284 DEFAULT_FACE_ID, 1); 3284 DEFAULT_FACE_ID, 1);
3285 selectface = intern ("tty-menu-selected-face"); 3285 selectface = intern ("tty-menu-selected-face");
3286 faces[2] = lookup_derived_face (NULL, sf, selectface, 3286 faces[2] = lookup_derived_face (NULL, sf, selectface,
@@ -4798,4 +4798,12 @@ trigger redisplay. */);
4798 DEFSYM (Qtty_menu_mouse_movement, "tty-menu-mouse-movement"); 4798 DEFSYM (Qtty_menu_mouse_movement, "tty-menu-mouse-movement");
4799 DEFSYM (Qtty_menu_navigation_map, "tty-menu-navigation-map"); 4799 DEFSYM (Qtty_menu_navigation_map, "tty-menu-navigation-map");
4800#endif 4800#endif
4801 DEFSYM (Qf0, "f0");
4802 DEFSYM (Qf10, "f10");
4803 DEFSYM (Qtty_set_up_initial_frame_faces,
4804 "tty-set-up-initial-frame-faces");
4805 DEFSYM (Qsuspend_tty_functions, "suspend-tty-functions");
4806 DEFSYM (Qresume_tty_functions, "resume-tty-functions");
4807 DEFSYM (Qtty_menu_disabled_face, "tty-menu-disabled-face");
4808 DEFSYM (Qtty_menu_enabled_face, "tty-menu-enabled-face");
4801} 4809}
diff --git a/src/terminal.c b/src/terminal.c
index 23a5582d4d9..e8316ba32e8 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -287,14 +287,12 @@ create_terminal (enum output_method type, struct redisplay_interface *rif)
287 /* If default coding systems for the terminal and the keyboard are 287 /* If default coding systems for the terminal and the keyboard are
288 already defined, use them in preference to the defaults. This is 288 already defined, use them in preference to the defaults. This is
289 needed when Emacs runs in daemon mode. */ 289 needed when Emacs runs in daemon mode. */
290 keyboard_coding = 290 keyboard_coding = find_symbol_value (Qdefault_keyboard_coding_system);
291 find_symbol_value (intern ("default-keyboard-coding-system"));
292 if (NILP (keyboard_coding) 291 if (NILP (keyboard_coding)
293 || BASE_EQ (keyboard_coding, Qunbound) 292 || BASE_EQ (keyboard_coding, Qunbound)
294 || NILP (Fcoding_system_p (keyboard_coding))) 293 || NILP (Fcoding_system_p (keyboard_coding)))
295 keyboard_coding = Qno_conversion; 294 keyboard_coding = Qno_conversion;
296 terminal_coding = 295 terminal_coding = find_symbol_value (Qdefault_terminal_coding_system);
297 find_symbol_value (intern ("default-terminal-coding-system"));
298 if (NILP (terminal_coding) 296 if (NILP (terminal_coding)
299 || BASE_EQ (terminal_coding, Qunbound) 297 || BASE_EQ (terminal_coding, Qunbound)
300 || NILP (Fcoding_system_p (terminal_coding))) 298 || NILP (Fcoding_system_p (terminal_coding)))
@@ -654,7 +652,6 @@ delete_initial_terminal (struct terminal *terminal)
654void 652void
655syms_of_terminal (void) 653syms_of_terminal (void)
656{ 654{
657
658 DEFVAR_LISP ("ring-bell-function", Vring_bell_function, 655 DEFVAR_LISP ("ring-bell-function", Vring_bell_function,
659 doc: /* Non-nil means call this function to ring the bell. 656 doc: /* Non-nil means call this function to ring the bell.
660The function should accept no arguments. */); 657The function should accept no arguments. */);
@@ -681,4 +678,6 @@ or some time later. */);
681 defsubr (&Sset_terminal_parameter); 678 defsubr (&Sset_terminal_parameter);
682 679
683 Fprovide (intern_c_string ("multi-tty"), Qnil); 680 Fprovide (intern_c_string ("multi-tty"), Qnil);
681 DEFSYM (Qdefault_keyboard_coding_system, "default-keyboard-coding-system");
682 DEFSYM (Qdefault_terminal_coding_system, "default-terminal-coding-system");
684} 683}
diff --git a/src/w32fns.c b/src/w32fns.c
index ace8d1016a5..8b61b54bdc5 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -6539,7 +6539,7 @@ DEFUN ("x-display-backing-store", Fx_display_backing_store,
6539 doc: /* SKIP: real doc in xfns.c. */) 6539 doc: /* SKIP: real doc in xfns.c. */)
6540 (Lisp_Object display) 6540 (Lisp_Object display)
6541{ 6541{
6542 return intern ("not-useful"); 6542 return Qnot_useful;
6543} 6543}
6544 6544
6545DEFUN ("x-display-visual-class", Fx_display_visual_class, 6545DEFUN ("x-display-visual-class", Fx_display_visual_class,
@@ -6551,13 +6551,13 @@ DEFUN ("x-display-visual-class", Fx_display_visual_class,
6551 Lisp_Object result = Qnil; 6551 Lisp_Object result = Qnil;
6552 6552
6553 if (dpyinfo->has_palette) 6553 if (dpyinfo->has_palette)
6554 result = intern ("pseudo-color"); 6554 result = Qpseudo_color;
6555 else if (dpyinfo->n_planes * dpyinfo->n_cbits == 1) 6555 else if (dpyinfo->n_planes * dpyinfo->n_cbits == 1)
6556 result = intern ("static-gray"); 6556 result = Qstatic_gray;
6557 else if (dpyinfo->n_planes * dpyinfo->n_cbits == 4) 6557 else if (dpyinfo->n_planes * dpyinfo->n_cbits == 4)
6558 result = intern ("static-color"); 6558 result = Qstatic_color;
6559 else if (dpyinfo->n_planes * dpyinfo->n_cbits > 8) 6559 else if (dpyinfo->n_planes * dpyinfo->n_cbits > 8)
6560 result = intern ("true-color"); 6560 result = Qtrue_color;
6561 6561
6562 return result; 6562 return result;
6563} 6563}
@@ -6773,17 +6773,17 @@ SOUND is nil to use the normal beep. */)
6773 6773
6774 if (NILP (sound)) 6774 if (NILP (sound))
6775 sound_type = 0xFFFFFFFF; 6775 sound_type = 0xFFFFFFFF;
6776 else if (EQ (sound, intern ("asterisk"))) 6776 else if (EQ (sound, Qasterisk))
6777 sound_type = MB_ICONASTERISK; 6777 sound_type = MB_ICONASTERISK;
6778 else if (EQ (sound, intern ("exclamation"))) 6778 else if (EQ (sound, Qexclamation))
6779 sound_type = MB_ICONEXCLAMATION; 6779 sound_type = MB_ICONEXCLAMATION;
6780 else if (EQ (sound, intern ("hand"))) 6780 else if (EQ (sound, Qhand))
6781 sound_type = MB_ICONHAND; 6781 sound_type = MB_ICONHAND;
6782 else if (EQ (sound, intern ("question"))) 6782 else if (EQ (sound, Qquestion))
6783 sound_type = MB_ICONQUESTION; 6783 sound_type = MB_ICONQUESTION;
6784 else if (EQ (sound, intern ("ok"))) 6784 else if (EQ (sound, Qok))
6785 sound_type = MB_OK; 6785 sound_type = MB_OK;
6786 else if (EQ (sound, intern ("silent"))) 6786 else if (EQ (sound, Qsilent))
6787 sound_type = MB_EMACS_SILENT; 6787 sound_type = MB_EMACS_SILENT;
6788 else 6788 else
6789 sound_type = 0xFFFFFFFF; 6789 sound_type = 0xFFFFFFFF;
@@ -6854,7 +6854,7 @@ DEFUN ("x-open-connection", Fx_open_connection, Sx_open_connection,
6854 if (NILP (Ffile_readable_p (color_file))) 6854 if (NILP (Ffile_readable_p (color_file)))
6855 color_file = 6855 color_file =
6856 Fexpand_file_name (build_string ("rgb.txt"), 6856 Fexpand_file_name (build_string ("rgb.txt"),
6857 Fsymbol_value (intern ("data-directory"))); 6857 Fsymbol_value (Qdata_directory));
6858 6858
6859 Vw32_color_map = Fx_load_color_file (color_file); 6859 Vw32_color_map = Fx_load_color_file (color_file);
6860 } 6860 }
@@ -7749,8 +7749,8 @@ DEFUN ("x-show-tip", Fx_show_tip, Sx_show_tip, 1, 6, 0,
7749 7749
7750 start_timer: 7750 start_timer:
7751 /* Let the tip disappear after timeout seconds. */ 7751 /* Let the tip disappear after timeout seconds. */
7752 tip_timer = call3 (intern ("run-at-time"), timeout, Qnil, 7752 tip_timer = call3 (Qrun_at_time, timeout, Qnil,
7753 intern ("x-hide-tip")); 7753 Qx_hide_tip);
7754 7754
7755 return unbind_to (count, Qnil); 7755 return unbind_to (count, Qnil);
7756} 7756}
@@ -8188,15 +8188,14 @@ DEFUN ("x-file-dialog", Fx_file_dialog, Sx_file_dialog, 2, 5, 0,
8188 filename = Qnil; 8188 filename = Qnil;
8189 /* An error occurred, fallback on reading from the mini-buffer. */ 8189 /* An error occurred, fallback on reading from the mini-buffer. */
8190 else 8190 else
8191 filename = Fcompleting_read ( 8191 filename = Fcompleting_read (orig_prompt,
8192 orig_prompt, 8192 Qread_file_name_internal,
8193 intern ("read-file-name-internal"), 8193 orig_dir,
8194 orig_dir, 8194 mustmatch,
8195 mustmatch, 8195 orig_dir,
8196 orig_dir, 8196 Qfile_name_history,
8197 Qfile_name_history, 8197 default_filename,
8198 default_filename, 8198 Qnil);
8199 Qnil);
8200 } 8199 }
8201 8200
8202 /* Make "Cancel" equivalent to C-g. */ 8201 /* Make "Cancel" equivalent to C-g. */
@@ -8223,7 +8222,7 @@ DEFUN ("system-move-file-to-trash", Fsystem_move_file_to_trash,
8223 if (!NILP (Ffile_directory_p (filename)) 8222 if (!NILP (Ffile_directory_p (filename))
8224 && NILP (Ffile_symlink_p (filename))) 8223 && NILP (Ffile_symlink_p (filename)))
8225 { 8224 {
8226 operation = intern ("delete-directory"); 8225 operation = Qdelete_directory;
8227 filename = Fdirectory_file_name (filename); 8226 filename = Fdirectory_file_name (filename);
8228 } 8227 }
8229 8228
@@ -8927,11 +8926,11 @@ to change the state. */)
8927 int vk_code; 8926 int vk_code;
8928 LPARAM lparam; 8927 LPARAM lparam;
8929 8928
8930 if (EQ (key, intern ("capslock"))) 8929 if (EQ (key, Qcapslock))
8931 vk_code = VK_CAPITAL; 8930 vk_code = VK_CAPITAL;
8932 else if (EQ (key, intern ("kp-numlock"))) 8931 else if (EQ (key, Qkp_numlock))
8933 vk_code = VK_NUMLOCK; 8932 vk_code = VK_NUMLOCK;
8934 else if (EQ (key, intern ("scroll"))) 8933 else if (EQ (key, Qscroll))
8935 vk_code = VK_SCROLL; 8934 vk_code = VK_SCROLL;
8936 else 8935 else
8937 return Qnil; 8936 return Qnil;
@@ -10714,6 +10713,7 @@ syms_of_w32fns (void)
10714 DEFSYM (Qtip_frame, "tip-frame"); 10713 DEFSYM (Qtip_frame, "tip-frame");
10715 DEFSYM (Qassq_delete_all, "assq-delete-all"); 10714 DEFSYM (Qassq_delete_all, "assq-delete-all");
10716 DEFSYM (Qunicode_sip, "unicode-sip"); 10715 DEFSYM (Qunicode_sip, "unicode-sip");
10716 DEFSYM (Qread_file_name_internal, "read-file-name-internal");
10717#if defined WINDOWSNT && !defined HAVE_DBUS 10717#if defined WINDOWSNT && !defined HAVE_DBUS
10718 DEFSYM (QCicon, ":icon"); 10718 DEFSYM (QCicon, ":icon");
10719 DEFSYM (QCtip, ":tip"); 10719 DEFSYM (QCtip, ":tip");
@@ -11108,6 +11108,23 @@ keys when IME input is received. */);
11108 defsubr (&Ssystem_move_file_to_trash); 11108 defsubr (&Ssystem_move_file_to_trash);
11109 defsubr (&Sw32_set_wallpaper); 11109 defsubr (&Sw32_set_wallpaper);
11110#endif 11110#endif
11111
11112 DEFSYM (Qnot_useful, "not-useful");
11113 DEFSYM (Qpseudo_color, "pseudo-color");
11114 DEFSYM (Qstatic_gray, "static-gray");
11115 DEFSYM (Qstatic_color, "static-color");
11116 DEFSYM (Qtrue_color, "true-color");
11117 DEFSYM (Qasterisk, "asterisk");
11118 DEFSYM (Qexclamation, "exclamation");
11119 DEFSYM (Qquestion, "question");
11120 DEFSYM (Qok, "ok");
11121 DEFSYM (Qsilent, "silent");
11122 DEFSYM (Qdata_directory, "data-directory");
11123 DEFSYM (Qrun_at_time, "run-at-time");
11124 DEFSYM (Qx_hide_tip, "x-hide-tip");
11125 DEFSYM (Qcapslock, "capslock");
11126 DEFSYM (Qkp_numlock, "kp-numlock");
11127 DEFSYM (Qscroll, "scroll");
11111} 11128}
11112 11129
11113 11130
diff --git a/src/w32font.c b/src/w32font.c
index 56061c0d9ce..1c2da1b26fc 100644
--- a/src/w32font.c
+++ b/src/w32font.c
@@ -1196,15 +1196,15 @@ w32_enumfont_pattern_entity (Lisp_Object frame,
1196 if (EQ (backend, Quniscribe) && (full_type & NTMFLAGS_OPENTYPE)) 1196 if (EQ (backend, Quniscribe) && (full_type & NTMFLAGS_OPENTYPE))
1197 tem = Qopentype; 1197 tem = Qopentype;
1198 else if (font_type & TRUETYPE_FONTTYPE) 1198 else if (font_type & TRUETYPE_FONTTYPE)
1199 tem = intern ("truetype"); 1199 tem = Qtruetype;
1200 else if (full_type & NTM_PS_OPENTYPE) 1200 else if (full_type & NTM_PS_OPENTYPE)
1201 tem = Qpostscript; 1201 tem = Qpostscript;
1202 else if (full_type & NTM_TYPE1) 1202 else if (full_type & NTM_TYPE1)
1203 tem = intern ("type1"); 1203 tem = Qtype1;
1204 else if (font_type & RASTER_FONTTYPE) 1204 else if (font_type & RASTER_FONTTYPE)
1205 tem = intern ("w32bitmap"); 1205 tem = Qw32bitmap;
1206 else 1206 else
1207 tem = intern ("w32vector"); 1207 tem = Qw32vector;
1208 1208
1209 font_put_extra (entity, QCformat, tem); 1209 font_put_extra (entity, QCformat, tem);
1210 1210
@@ -2773,6 +2773,12 @@ syms_of_w32font (void)
2773 DEFSYM (Qsubpixel, "subpixel"); 2773 DEFSYM (Qsubpixel, "subpixel");
2774 DEFSYM (Qnatural, "natural"); 2774 DEFSYM (Qnatural, "natural");
2775 2775
2776 /* Font formats. */
2777 DEFSYM (Qtruetype, "truetype");
2778 DEFSYM (Qtype1, "type1");
2779 DEFSYM (Qw32bitmap, "w32bitmap");
2780 DEFSYM (Qw32vector, "w32vector");
2781
2776 /* Languages */ 2782 /* Languages */
2777 DEFSYM (Qzh, "zh"); 2783 DEFSYM (Qzh, "zh");
2778 2784
diff --git a/src/w32term.c b/src/w32term.c
index 64dbafab3fd..9b10e4c3342 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -6417,17 +6417,17 @@ w32_bitmap_icon (struct frame *f, Lisp_Object icon)
6417 { 6417 {
6418 LPCTSTR name; 6418 LPCTSTR name;
6419 6419
6420 if (EQ (icon, intern ("application"))) 6420 if (EQ (icon, Qapplication))
6421 name = (LPCTSTR) IDI_APPLICATION; 6421 name = (LPCTSTR) IDI_APPLICATION;
6422 else if (EQ (icon, intern ("hand"))) 6422 else if (EQ (icon, Qhand))
6423 name = (LPCTSTR) IDI_HAND; 6423 name = (LPCTSTR) IDI_HAND;
6424 else if (EQ (icon, intern ("question"))) 6424 else if (EQ (icon, Qquestion))
6425 name = (LPCTSTR) IDI_QUESTION; 6425 name = (LPCTSTR) IDI_QUESTION;
6426 else if (EQ (icon, intern ("exclamation"))) 6426 else if (EQ (icon, Qexclamation))
6427 name = (LPCTSTR) IDI_EXCLAMATION; 6427 name = (LPCTSTR) IDI_EXCLAMATION;
6428 else if (EQ (icon, intern ("asterisk"))) 6428 else if (EQ (icon, Qasterisk))
6429 name = (LPCTSTR) IDI_ASTERISK; 6429 name = (LPCTSTR) IDI_ASTERISK;
6430 else if (EQ (icon, intern ("winlogo"))) 6430 else if (EQ (icon, Qwinlogo))
6431 name = (LPCTSTR) IDI_WINLOGO; 6431 name = (LPCTSTR) IDI_WINLOGO;
6432 else 6432 else
6433 return 1; 6433 return 1;
@@ -7834,6 +7834,10 @@ syms_of_w32term (void)
7834 DEFSYM (Qrenamed_from, "renamed-from"); 7834 DEFSYM (Qrenamed_from, "renamed-from");
7835 DEFSYM (Qrenamed_to, "renamed-to"); 7835 DEFSYM (Qrenamed_to, "renamed-to");
7836 7836
7837 /* Bitmap icon constants. */
7838 DEFSYM (Qapplication, "application");
7839 DEFSYM (Qwinlogo, "winlogo");
7840
7837 DEFVAR_LISP ("x-wait-for-event-timeout", Vx_wait_for_event_timeout, 7841 DEFVAR_LISP ("x-wait-for-event-timeout", Vx_wait_for_event_timeout,
7838 doc: /* SKIP: real doc in xterm.c. */); 7842 doc: /* SKIP: real doc in xterm.c. */);
7839 Vx_wait_for_event_timeout = make_float (0.1); 7843 Vx_wait_for_event_timeout = make_float (0.1);
diff --git a/src/xdisp.c b/src/xdisp.c
index a52c5250c5c..a7cae804006 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -12053,8 +12053,8 @@ message_dolog (const char *m, ptrdiff_t nbytes, bool nlflag, bool multibyte)
12053 bool newbuffer = NILP (Fget_buffer (Vmessages_buffer_name)); 12053 bool newbuffer = NILP (Fget_buffer (Vmessages_buffer_name));
12054 Fset_buffer (Fget_buffer_create (Vmessages_buffer_name, Qnil)); 12054 Fset_buffer (Fget_buffer_create (Vmessages_buffer_name, Qnil));
12055 if (newbuffer 12055 if (newbuffer
12056 && !NILP (Ffboundp (intern ("messages-buffer-mode")))) 12056 && !NILP (Ffboundp (Qmessages_buffer_mode)))
12057 call0 (intern ("messages-buffer-mode")); 12057 call0 (Qmessages_buffer_mode);
12058 12058
12059 bset_undo_list (current_buffer, Qt); 12059 bset_undo_list (current_buffer, Qt);
12060 bset_cache_long_scans (current_buffer, Qnil); 12060 bset_cache_long_scans (current_buffer, Qnil);
@@ -35379,15 +35379,15 @@ define_frame_cursor1 (struct frame *f, Emacs_Cursor cursor, Lisp_Object pointer)
35379 cursor = FRAME_OUTPUT_DATA (f)->hand_cursor; 35379 cursor = FRAME_OUTPUT_DATA (f)->hand_cursor;
35380 else if (EQ (pointer, Qtext)) 35380 else if (EQ (pointer, Qtext))
35381 cursor = FRAME_OUTPUT_DATA (f)->text_cursor; 35381 cursor = FRAME_OUTPUT_DATA (f)->text_cursor;
35382 else if (EQ (pointer, intern ("hdrag"))) 35382 else if (EQ (pointer, Qhdrag))
35383 cursor = FRAME_OUTPUT_DATA (f)->horizontal_drag_cursor; 35383 cursor = FRAME_OUTPUT_DATA (f)->horizontal_drag_cursor;
35384 else if (EQ (pointer, intern ("nhdrag"))) 35384 else if (EQ (pointer, Qnhdrag))
35385 cursor = FRAME_OUTPUT_DATA (f)->vertical_drag_cursor; 35385 cursor = FRAME_OUTPUT_DATA (f)->vertical_drag_cursor;
35386# ifdef HAVE_X_WINDOWS 35386# ifdef HAVE_X_WINDOWS
35387 else if (EQ (pointer, intern ("vdrag"))) 35387 else if (EQ (pointer, Qvdrag))
35388 cursor = FRAME_DISPLAY_INFO (f)->vertical_scroll_bar_cursor; 35388 cursor = FRAME_DISPLAY_INFO (f)->vertical_scroll_bar_cursor;
35389# endif 35389# endif
35390 else if (EQ (pointer, intern ("hourglass"))) 35390 else if (EQ (pointer, Qhourglass))
35391 cursor = FRAME_OUTPUT_DATA (f)->hourglass_cursor; 35391 cursor = FRAME_OUTPUT_DATA (f)->hourglass_cursor;
35392 else if (EQ (pointer, Qmodeline)) 35392 else if (EQ (pointer, Qmodeline))
35393 cursor = FRAME_OUTPUT_DATA (f)->modeline_cursor; 35393 cursor = FRAME_OUTPUT_DATA (f)->modeline_cursor;
@@ -38263,6 +38263,13 @@ depending on your patience and the speed of your system. */);
38263 38263
38264 /* Called by decode_mode_spec. */ 38264 /* Called by decode_mode_spec. */
38265 DEFSYM (Qfile_remote_p, "file-remote-p"); 38265 DEFSYM (Qfile_remote_p, "file-remote-p");
38266
38267 /* Called or compared against by various functions. */
38268 DEFSYM (Qmessages_buffer_mode, "messages-buffer-mode");
38269 DEFSYM (Qhdrag, "hdrag");
38270 DEFSYM (Qnhdrag, "nhdrag");
38271 DEFSYM (Qvdrag, "vdrag");
38272 DEFSYM (Qhourglass, "hourglass");
38266} 38273}
38267 38274
38268 38275
diff --git a/src/xfaces.c b/src/xfaces.c
index d5079491258..5192b22ce0a 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -1084,7 +1084,7 @@ tty_lookup_color (struct frame *f, Lisp_Object color, Emacs_Color *tty_color,
1084 1084
1085 return true; 1085 return true;
1086 } 1086 }
1087 else if (NILP (Fsymbol_value (intern ("tty-defined-color-alist")))) 1087 else if (NILP (Fsymbol_value (Qtty_defined_color_alist)))
1088 /* We were called early during startup, and the colors are not 1088 /* We were called early during startup, and the colors are not
1089 yet set up in tty-defined-color-alist. Don't return a failure 1089 yet set up in tty-defined-color-alist. Don't return a failure
1090 indication, since this produces the annoying "Unable to 1090 indication, since this produces the annoying "Unable to
@@ -7408,6 +7408,7 @@ syms_of_xfaces (void)
7408 7408
7409 /* The name of the function used to compute colors on TTYs. */ 7409 /* The name of the function used to compute colors on TTYs. */
7410 DEFSYM (Qtty_color_alist, "tty-color-alist"); 7410 DEFSYM (Qtty_color_alist, "tty-color-alist");
7411 DEFSYM (Qtty_defined_color_alist, "tty-defined-color-alist");
7411 7412
7412 Vface_alternative_font_family_alist = Qnil; 7413 Vface_alternative_font_family_alist = Qnil;
7413 staticpro (&Vface_alternative_font_family_alist); 7414 staticpro (&Vface_alternative_font_family_alist);
diff --git a/src/xml.c b/src/xml.c
index 85f16746289..dc707bea864 100644
--- a/src/xml.c
+++ b/src/xml.c
@@ -165,7 +165,7 @@ make_dom (xmlNode *node)
165 else if (node->type == XML_COMMENT_NODE) 165 else if (node->type == XML_COMMENT_NODE)
166 { 166 {
167 if (node->content) 167 if (node->content)
168 return list3 (intern ("comment"), Qnil, 168 return list3 (Qcomment, Qnil,
169 build_string ((char *) node->content)); 169 build_string ((char *) node->content));
170 else 170 else
171 return Qnil; 171 return Qnil;
@@ -353,4 +353,6 @@ syms_of_xml (void)
353 defsubr (&Slibxml_parse_xml_region); 353 defsubr (&Slibxml_parse_xml_region);
354#endif 354#endif
355 defsubr (&Slibxml_available_p); 355 defsubr (&Slibxml_available_p);
356
357 DEFSYM (Qcomment, "comment");
356} 358}
diff --git a/src/xterm.c b/src/xterm.c
index 44f0cc55fd7..33ef18d8da5 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -32569,9 +32569,6 @@ syms_of_xterm (void)
32569 x_dnd_unsupported_drop_data = Qnil; 32569 x_dnd_unsupported_drop_data = Qnil;
32570 staticpro (&x_dnd_unsupported_drop_data); 32570 staticpro (&x_dnd_unsupported_drop_data);
32571 32571
32572 /* Used by x_cr_export_frames. */
32573 DEFSYM (Qconcat, "concat");
32574
32575 DEFSYM (Qvendor_specific_keysyms, "vendor-specific-keysyms"); 32572 DEFSYM (Qvendor_specific_keysyms, "vendor-specific-keysyms");
32576 DEFSYM (Qlatin_1, "latin-1"); 32573 DEFSYM (Qlatin_1, "latin-1");
32577 DEFSYM (Qnow, "now"); 32574 DEFSYM (Qnow, "now");
@@ -32677,6 +32674,10 @@ Android does not support scroll bars at all. */);
32677 DEFSYM (Qraise_and_focus, "raise-and-focus"); 32674 DEFSYM (Qraise_and_focus, "raise-and-focus");
32678 DEFSYM (Qreally_fast, "really-fast"); 32675 DEFSYM (Qreally_fast, "really-fast");
32679 32676
32677 /* Referenced in gtkutil.c. */
32678 DEFSYM (Qtheme_name, "theme-name");
32679 DEFSYM (Qfile_name_sans_extension, "file-name-sans-extension");
32680
32680 DEFVAR_LISP ("x-ctrl-keysym", Vx_ctrl_keysym, 32681 DEFVAR_LISP ("x-ctrl-keysym", Vx_ctrl_keysym,
32681 doc: /* Which modifer value Emacs reports when Ctrl is depressed. 32682 doc: /* Which modifer value Emacs reports when Ctrl is depressed.
32682This should be one of the symbols `ctrl', `alt', `hyper', `meta', or 32683This should be one of the symbols `ctrl', `alt', `hyper', `meta', or
diff --git a/src/xwidget.c b/src/xwidget.c
index 389c48ca7f5..04ebcbfe96c 100644
--- a/src/xwidget.c
+++ b/src/xwidget.c
@@ -2286,7 +2286,7 @@ store_xwidget_download_callback_event (struct xwidget *xw,
2286 EVENT_INIT (event); 2286 EVENT_INIT (event);
2287 event.kind = XWIDGET_EVENT; 2287 event.kind = XWIDGET_EVENT;
2288 event.frame_or_window = Qnil; 2288 event.frame_or_window = Qnil;
2289 event.arg = list5 (intern ("download-callback"), 2289 event.arg = list5 (Qdownload_callback,
2290 xwl, 2290 xwl,
2291 build_string (url), 2291 build_string (url),
2292 build_string (mimetype), 2292 build_string (mimetype),
@@ -2305,7 +2305,7 @@ store_xwidget_js_callback_event (struct xwidget *xw,
2305 EVENT_INIT (event); 2305 EVENT_INIT (event);
2306 event.kind = XWIDGET_EVENT; 2306 event.kind = XWIDGET_EVENT;
2307 event.frame_or_window = Qnil; 2307 event.frame_or_window = Qnil;
2308 event.arg = list4 (intern ("javascript-callback"), xwl, proc, argument); 2308 event.arg = list4 (Qjavascript_callback, xwl, proc, argument);
2309 kbd_buffer_store_event (&event); 2309 kbd_buffer_store_event (&event);
2310} 2310}
2311 2311
@@ -4001,6 +4001,8 @@ to take effect. */);
4001 staticpro (&dummy_tooltip_string); 4001 staticpro (&dummy_tooltip_string);
4002#endif 4002#endif
4003#endif 4003#endif
4004 DEFSYM (Qdownload_callback, "download-callback");
4005 DEFSYM (Qjavascript_callback, "javascript-callback");
4004} 4006}
4005 4007
4006 4008