Mercurial > emacs
comparison src/emacs.c @ 105877:21bdda3ded62
* xterm.c (syms_of_xterm):
* xselect.c (syms_of_xselect):
* xmenu.c (syms_of_xmenu):
* xfns.c (syms_of_xfns):
* xfaces.c (syms_of_xfaces):
* xdisp.c (syms_of_xdisp):
* window.c (syms_of_window):
* w32fns.c (syms_of_w32fns):
* undo.c (syms_of_undo):
* textprop.c (syms_of_textprop):
* terminal.c (syms_of_terminal):
* syntax.c (syms_of_syntax):
* sound.c (syms_of_sound):
* search.c (syms_of_search):
* print.c (syms_of_print):
* minibuf.c (syms_of_minibuf):
* macros.c (syms_of_macros):
* keymap.c (syms_of_keymap, initial_define_key)
(initial_define_lispy_key):
* keyboard.c (syms_of_keyboard):
* insdel.c (syms_of_insdel):
* image.c (syms_of_image):
* fringe.c (syms_of_fringe):
* frame.c (syms_of_frame):
* fontset.c (syms_of_fontset):
* fns.c (syms_of_fns):
* fns.c (syms_of_fns):
* fileio.c (syms_of_fileio):
* fileio.c (syms_of_fileio):
* eval.c (syms_of_eval):
* doc.c (syms_of_doc):
* dispnew.c (syms_of_display):
* dired.c (syms_of_dired):
* dbusbind.c (syms_of_dbusbind):
* data.c (syms_of_data):
* composite.c (syms_of_composite):
* coding.c (syms_of_coding):
* cmds.c (syms_of_cmds):
* charset.c (define_charset_internal, syms_of_character):
* ccl.c (syms_of_ccl):
* category.c (syms_of_category, init_category_once):
* casetab.c (syms_of_casetab):
* casefiddle.c (syms_of_casefiddle):
* callint.c (syms_of_callint):
* bytecode.c (syms_of_bytecode):
* buffer.c (keys_of_buffer, syms_of_buffer):
* alloc.c (syms_of_alloc):
* process.c (syms_of_process, init_process):
* lread.c (syms_of_lread, init_obarray):
* font.c (build_style_table):
* emacs.c (syms_of_emacs, main): Replace calls to intern with
intern_c_string, calls to make_pure_string with
make_pure_c_string. Use pure_cons instead of Fcons.
* process.c (socket_options): Make it const.
(set_socket_option, init_process): Use a const pointer.
* lread.c (intern_c_string): New function.
(defvar_kboard, defvar_lisp, defvar_lisp_nopro, defvar_bool)
(defvar_int): Uset it. Make the name const char*.
* font.c (struct table_entry): Remove unused member. Make NAMES
constant.
(weight_table, slant_table, width_table): Make constant.
* emacs.c (struct standard_args): Make name and longname constant.
author | Dan Nicolaescu <dann@ics.uci.edu> |
---|---|
date | Fri, 06 Nov 2009 06:50:52 +0000 |
parents | 89183b6f6e9d |
children | cd4cbab8bb21 |
comparison
equal
deleted
inserted
replaced
105876:c5c76c2da5ee | 105877:21bdda3ded62 |
---|---|
844 /* We don't know the version number unless this is a dumped Emacs. | 844 /* We don't know the version number unless this is a dumped Emacs. |
845 So ignore --version otherwise. */ | 845 So ignore --version otherwise. */ |
846 && initialized) | 846 && initialized) |
847 { | 847 { |
848 Lisp_Object tem, tem2; | 848 Lisp_Object tem, tem2; |
849 tem = Fsymbol_value (intern ("emacs-version")); | 849 tem = Fsymbol_value (intern_c_string ("emacs-version")); |
850 tem2 = Fsymbol_value (intern ("emacs-copyright")); | 850 tem2 = Fsymbol_value (intern_c_string ("emacs-copyright")); |
851 if (!STRINGP (tem)) | 851 if (!STRINGP (tem)) |
852 { | 852 { |
853 fprintf (stderr, "Invalid value of `emacs-version'\n"); | 853 fprintf (stderr, "Invalid value of `emacs-version'\n"); |
854 exit (1); | 854 exit (1); |
855 } | 855 } |
1434 || (getenv ("EMACS_UNIBYTE") && !inhibit_unibyte)) | 1434 || (getenv ("EMACS_UNIBYTE") && !inhibit_unibyte)) |
1435 { | 1435 { |
1436 Lisp_Object old_log_max; | 1436 Lisp_Object old_log_max; |
1437 Lisp_Object symbol, tail; | 1437 Lisp_Object symbol, tail; |
1438 | 1438 |
1439 symbol = intern ("enable-multibyte-characters"); | 1439 symbol = intern_c_string ("enable-multibyte-characters"); |
1440 Fset_default (symbol, Qnil); | 1440 Fset_default (symbol, Qnil); |
1441 | 1441 |
1442 if (initialized) | 1442 if (initialized) |
1443 { | 1443 { |
1444 /* Erase pre-dump messages in *Messages* now so no abort. */ | 1444 /* Erase pre-dump messages in *Messages* now so no abort. */ |
1753 if (!initialized) | 1753 if (!initialized) |
1754 { | 1754 { |
1755 char *file; | 1755 char *file; |
1756 /* Handle -l loadup, args passed by Makefile. */ | 1756 /* Handle -l loadup, args passed by Makefile. */ |
1757 if (argmatch (argv, argc, "-l", "--load", 3, &file, &skip_args)) | 1757 if (argmatch (argv, argc, "-l", "--load", 3, &file, &skip_args)) |
1758 Vtop_level = Fcons (intern ("load"), | 1758 Vtop_level = Fcons (intern_c_string ("load"), |
1759 Fcons (build_string (file), Qnil)); | 1759 Fcons (build_string (file), Qnil)); |
1760 /* Unless next switch is -nl, load "loadup.el" first thing. */ | 1760 /* Unless next switch is -nl, load "loadup.el" first thing. */ |
1761 if (! no_loadup) | 1761 if (! no_loadup) |
1762 Vtop_level = Fcons (intern ("load"), | 1762 Vtop_level = Fcons (intern_c_string ("load"), |
1763 Fcons (build_string ("loadup.el"), Qnil)); | 1763 Fcons (build_string ("loadup.el"), Qnil)); |
1764 } | 1764 } |
1765 | 1765 |
1766 if (initialized) | 1766 if (initialized) |
1767 { | 1767 { |
2539 } | 2539 } |
2540 | 2540 |
2541 void | 2541 void |
2542 syms_of_emacs () | 2542 syms_of_emacs () |
2543 { | 2543 { |
2544 Qfile_name_handler_alist = intern ("file-name-handler-alist"); | 2544 Qfile_name_handler_alist = intern_c_string ("file-name-handler-alist"); |
2545 staticpro (&Qfile_name_handler_alist); | 2545 staticpro (&Qfile_name_handler_alist); |
2546 | 2546 |
2547 #ifndef CANNOT_DUMP | 2547 #ifndef CANNOT_DUMP |
2548 #ifdef HAVE_SHM | 2548 #ifdef HAVE_SHM |
2549 defsubr (&Sdump_emacs_data); | 2549 defsubr (&Sdump_emacs_data); |
2573 `ms-dos' compiled as an MS-DOS application. | 2573 `ms-dos' compiled as an MS-DOS application. |
2574 `windows-nt' compiled as a native W32 application. | 2574 `windows-nt' compiled as a native W32 application. |
2575 `cygwin' compiled using the Cygwin library. | 2575 `cygwin' compiled using the Cygwin library. |
2576 Anything else (in Emacs 23.1, the possibilities are: aix, berkeley-unix, | 2576 Anything else (in Emacs 23.1, the possibilities are: aix, berkeley-unix, |
2577 hpux, irix, lynxos 3.0.1, usg-unix-v) indicates some sort of Unix system. */); | 2577 hpux, irix, lynxos 3.0.1, usg-unix-v) indicates some sort of Unix system. */); |
2578 Vsystem_type = intern (SYSTEM_TYPE); | 2578 Vsystem_type = intern_c_string (SYSTEM_TYPE); |
2579 | 2579 |
2580 DEFVAR_LISP ("system-configuration", &Vsystem_configuration, | 2580 DEFVAR_LISP ("system-configuration", &Vsystem_configuration, |
2581 doc: /* Value is string indicating configuration Emacs was built for. | 2581 doc: /* Value is string indicating configuration Emacs was built for. |
2582 On MS-Windows, the value reflects the OS flavor and version on which | 2582 On MS-Windows, the value reflects the OS flavor and version on which |
2583 Emacs is running. */); | 2583 Emacs is running. */); |