diff options
| author | Dmitry Antipov | 2014-09-16 12:20:08 +0400 |
|---|---|---|
| committer | Dmitry Antipov | 2014-09-16 12:20:08 +0400 |
| commit | b98b1a831bcfc89f038cbb8048c6969d8c73ab28 (patch) | |
| tree | aaefabe0ced95ba3b34e59ed78d452d4036d99e5 /src/buffer.c | |
| parent | 3a41eb66c104adbbc9040b817eee76a5aedd5d16 (diff) | |
| download | emacs-b98b1a831bcfc89f038cbb8048c6969d8c73ab28.tar.gz emacs-b98b1a831bcfc89f038cbb8048c6969d8c73ab28.zip | |
If USE_LOCAL_ALLOCATORS, allocate even more Lisp objects on stack.
* charset.c (load_charset_map_from_file): Use scoped_list2
and build_local_string.
* buffer.c (Fother_buffer, other_buffer_safely, init_buffer):
* emacs.c (init_cmdargs, decode_env_path):
* fileio.c (Fexpand_file_name):
* fns.c (maybe_resize_hash_table) [ENABLE_CHECKING]:
* frame.c (x_get_arg):
* keyboard.c (safe_run_hooks_error):
* lread.c (load_warn_old_style_backquotes):
* xdisp.c (Fcurrent_bidi_paragraph_direction):
* xfns.c (x_default_scroll_bar_color_parameter, select_visual):
* xselect.c (x_clipboard_manager_error_1)
(x_clipboard_manager_save_all):
* xterm.c (x_term_init): Use build_local_string.
Diffstat (limited to 'src/buffer.c')
| -rw-r--r-- | src/buffer.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/buffer.c b/src/buffer.c index 566a9a1b576..a68afc6cd4f 100644 --- a/src/buffer.c +++ b/src/buffer.c | |||
| @@ -1552,10 +1552,10 @@ exists, return the buffer `*scratch*' (creating it if necessary). */) | |||
| 1552 | return notsogood; | 1552 | return notsogood; |
| 1553 | else | 1553 | else |
| 1554 | { | 1554 | { |
| 1555 | buf = Fget_buffer (build_string ("*scratch*")); | 1555 | buf = Fget_buffer (build_local_string ("*scratch*")); |
| 1556 | if (NILP (buf)) | 1556 | if (NILP (buf)) |
| 1557 | { | 1557 | { |
| 1558 | buf = Fget_buffer_create (build_string ("*scratch*")); | 1558 | buf = Fget_buffer_create (build_local_string ("*scratch*")); |
| 1559 | Fset_buffer_major_mode (buf); | 1559 | Fset_buffer_major_mode (buf); |
| 1560 | } | 1560 | } |
| 1561 | return buf; | 1561 | return buf; |
| @@ -1575,10 +1575,10 @@ other_buffer_safely (Lisp_Object buffer) | |||
| 1575 | if (candidate_buffer (buf, buffer)) | 1575 | if (candidate_buffer (buf, buffer)) |
| 1576 | return buf; | 1576 | return buf; |
| 1577 | 1577 | ||
| 1578 | buf = Fget_buffer (build_string ("*scratch*")); | 1578 | buf = Fget_buffer (build_local_string ("*scratch*")); |
| 1579 | if (NILP (buf)) | 1579 | if (NILP (buf)) |
| 1580 | { | 1580 | { |
| 1581 | buf = Fget_buffer_create (build_string ("*scratch*")); | 1581 | buf = Fget_buffer_create (build_local_string ("*scratch*")); |
| 1582 | Fset_buffer_major_mode (buf); | 1582 | Fset_buffer_major_mode (buf); |
| 1583 | } | 1583 | } |
| 1584 | 1584 | ||
| @@ -5289,7 +5289,7 @@ init_buffer (int initialized) | |||
| 5289 | initialized = initialized; | 5289 | initialized = initialized; |
| 5290 | #endif /* USE_MMAP_FOR_BUFFERS */ | 5290 | #endif /* USE_MMAP_FOR_BUFFERS */ |
| 5291 | 5291 | ||
| 5292 | Fset_buffer (Fget_buffer_create (build_string ("*scratch*"))); | 5292 | Fset_buffer (Fget_buffer_create (build_local_string ("*scratch*"))); |
| 5293 | if (NILP (BVAR (&buffer_defaults, enable_multibyte_characters))) | 5293 | if (NILP (BVAR (&buffer_defaults, enable_multibyte_characters))) |
| 5294 | Fset_buffer_multibyte (Qnil); | 5294 | Fset_buffer_multibyte (Qnil); |
| 5295 | 5295 | ||
| @@ -5328,7 +5328,7 @@ init_buffer (int initialized) | |||
| 5328 | && strcmp ("/", SSDATA (BVAR (current_buffer, directory)))) | 5328 | && strcmp ("/", SSDATA (BVAR (current_buffer, directory)))) |
| 5329 | bset_directory | 5329 | bset_directory |
| 5330 | (current_buffer, | 5330 | (current_buffer, |
| 5331 | concat2 (build_string ("/:"), BVAR (current_buffer, directory))); | 5331 | concat2 (build_local_string ("/:"), BVAR (current_buffer, directory))); |
| 5332 | 5332 | ||
| 5333 | temp = get_minibuffer (0); | 5333 | temp = get_minibuffer (0); |
| 5334 | bset_directory (XBUFFER (temp), BVAR (current_buffer, directory)); | 5334 | bset_directory (XBUFFER (temp), BVAR (current_buffer, directory)); |