# HG changeset patch # User Dan Nicolaescu # Date 1257919842 0 # Node ID 5fc80e6b5b7cb02ee66f530eb33a7c07e43dcc2a # Parent d1bb0f3aad3584e9c4211c6825ab56ab73d2d23f * xfns.c (syms_of_xfns): Use make_pure_string instead of build_string. * xterm.c (syms_of_xterm): * xfaces.c (syms_of_xfaces): * xdisp.c (syms_of_xdisp): * lread.c (syms_of_lread): * keyboard.c (syms_of_keyboard): Use make_pure_c_string instead of build_string. * doc.c (Fsnarf_documentation): Purecopy Vbuild_files. diff -r d1bb0f3aad35 -r 5fc80e6b5b7c src/ChangeLog --- a/src/ChangeLog Wed Nov 11 06:06:43 2009 +0000 +++ b/src/ChangeLog Wed Nov 11 06:10:42 2009 +0000 @@ -1,3 +1,14 @@ +2009-11-11 Dan Nicolaescu + + * xfns.c (syms_of_xfns): Use make_pure_string instead of build_string. + * xterm.c (syms_of_xterm): + * xfaces.c (syms_of_xfaces): + * xdisp.c (syms_of_xdisp): + * lread.c (syms_of_lread): + * keyboard.c (syms_of_keyboard): Use make_pure_c_string instead of + build_string. + * doc.c (Fsnarf_documentation): Purecopy Vbuild_files. + 2009-11-10 Stefan Monnier * fns.c (Fplist_get): Merge the active and the uncommented code. diff -r d1bb0f3aad35 -r 5fc80e6b5b7c src/doc.c --- a/src/doc.c Wed Nov 11 06:06:43 2009 +0000 +++ b/src/doc.c Wed Nov 11 06:10:42 2009 +0000 @@ -619,6 +619,7 @@ if (len > 0) Vbuild_files = Fcons (make_string (beg, len), Vbuild_files); } + Vbuild_files = Fpurecopy (Vbuild_files); } fd = emacs_open (name, O_RDONLY, 0); diff -r d1bb0f3aad35 -r 5fc80e6b5b7c src/keyboard.c --- a/src/keyboard.c Wed Nov 11 06:06:43 2009 +0000 +++ b/src/keyboard.c Wed Nov 11 06:10:42 2009 +0000 @@ -11729,7 +11729,7 @@ pending_funcalls = Qnil; staticpro (&pending_funcalls); - Vlispy_mouse_stem = build_string ("mouse"); + Vlispy_mouse_stem = make_pure_c_string ("mouse"); staticpro (&Vlispy_mouse_stem); /* Tool-bars. */ diff -r d1bb0f3aad35 -r 5fc80e6b5b7c src/lread.c --- a/src/lread.c Wed Nov 11 06:06:43 2009 +0000 +++ b/src/lread.c Wed Nov 11 06:10:42 2009 +0000 @@ -4330,8 +4330,8 @@ This list should not include the empty string. `load' and related functions try to append these suffixes, in order, to the specified file name if a Lisp suffix is allowed or required. */); - Vload_suffixes = Fcons (build_string (".elc"), - Fcons (build_string (".el"), Qnil)); + Vload_suffixes = Fcons (make_pure_c_string (".elc"), + Fcons (make_pure_c_string (".el"), Qnil)); DEFVAR_LISP ("load-file-rep-suffixes", &Vload_file_rep_suffixes, doc: /* List of suffixes that indicate representations of \ the same file. diff -r d1bb0f3aad35 -r 5fc80e6b5b7c src/xdisp.c --- a/src/xdisp.c Wed Nov 11 06:06:43 2009 +0000 +++ b/src/xdisp.c Wed Nov 11 06:10:42 2009 +0000 @@ -24782,7 +24782,7 @@ staticpro (&echo_area_buffer[0]); staticpro (&echo_area_buffer[1]); - Vmessages_buffer_name = build_string ("*Messages*"); + Vmessages_buffer_name = make_pure_c_string ("*Messages*"); staticpro (&Vmessages_buffer_name); mode_line_proptrans_alist = Qnil; @@ -24852,7 +24852,7 @@ DEFVAR_LISP ("overlay-arrow-string", &Voverlay_arrow_string, doc: /* String to display as an arrow in non-window frames. See also `overlay-arrow-position'. */); - Voverlay_arrow_string = build_string ("=>"); + Voverlay_arrow_string = make_pure_c_string ("=>"); DEFVAR_LISP ("overlay-arrow-variable-list", &Voverlay_arrow_variable_list, doc: /* List of variables (symbols) which hold markers for overlay arrows. @@ -24953,14 +24953,14 @@ \(see `modify-frame-parameters'). */); Vicon_title_format = Vframe_title_format - = Fcons (intern_c_string ("multiple-frames"), - Fcons (build_string ("%b"), - Fcons (Fcons (empty_unibyte_string, - Fcons (intern_c_string ("invocation-name"), - Fcons (build_string ("@"), - Fcons (intern_c_string ("system-name"), - Qnil)))), - Qnil))); + = pure_cons (make_pure_c_string ("multiple-frames"), + pure_cons (make_pure_c_string ("%b"), + pure_cons (pure_cons (empty_unibyte_string, + pure_cons (intern_c_string ("invocation-name"), + pure_cons (make_pure_c_string ("@"), + pure_cons (intern_c_string ("system-name"), + Qnil)))), + Qnil))); DEFVAR_LISP ("message-log-max", &Vmessage_log_max, doc: /* Maximum number of lines to keep in the message log buffer. diff -r d1bb0f3aad35 -r 5fc80e6b5b7c src/xfaces.c --- a/src/xfaces.c Wed Nov 11 06:06:43 2009 +0000 +++ b/src/xfaces.c Wed Nov 11 06:10:42 2009 +0000 @@ -6952,7 +6952,7 @@ This stipple pattern is used on monochrome displays instead of shades of gray for a face background color. See `set-face-stipple' for possible values for this variable. */); - Vface_default_stipple = build_string ("gray3"); + Vface_default_stipple = make_pure_c_string ("gray3"); DEFVAR_LISP ("tty-defined-color-alist", &Vtty_defined_color_alist, doc: /* An alist of defined terminal colors and their RGB values. */); diff -r d1bb0f3aad35 -r 5fc80e6b5b7c src/xfns.c --- a/src/xfns.c Wed Nov 11 06:06:43 2009 +0000 +++ b/src/xfns.c Wed Nov 11 06:10:42 2009 +0000 @@ -5932,7 +5932,7 @@ char gtk_version[40]; g_snprintf (gtk_version, sizeof (gtk_version), "%u.%u.%u", GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); - Vgtk_version_string = build_string (gtk_version); + Vgtk_version_string = make_pure_string (gtk_version, strlen (gtk_version), strlen (gtk_version), 0); } #endif /* USE_GTK */ diff -r d1bb0f3aad35 -r 5fc80e6b5b7c src/xterm.c --- a/src/xterm.c Wed Nov 11 06:06:43 2009 +0000 +++ b/src/xterm.c Wed Nov 11 06:10:42 2009 +0000 @@ -10847,7 +10847,7 @@ last_mouse_press_frame = Qnil; #ifdef USE_GTK - xg_default_icon_file = build_string ("icons/hicolor/scalable/apps/emacs.svg"); + xg_default_icon_file = make_pure_c_string ("icons/hicolor/scalable/apps/emacs.svg"); staticpro (&xg_default_icon_file); Qx_gtk_map_stock = intern_c_string ("x-gtk-map-stock");