From 955d5d047d1e15546bd9c548c0b966cb73300144 Mon Sep 17 00:00:00 2001 From: Dmitry Antipov Date: Fri, 3 Oct 2014 09:31:17 +0400 Subject: [PATCH] * fileio.c (emacs_readlinkat, Finsert_file_contents): * w32fns.c, xfns.c (x_create_tip_frame): Use AUTO_STRING. --- src/ChangeLog | 3 +++ src/fileio.c | 8 ++++++-- src/w32fns.c | 3 ++- src/xfns.c | 3 ++- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 6a4ef3a1dd9..3b263892c1e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -9,6 +9,9 @@ Adjust users. * gmalloc.c (min): Tiny style change. + * fileio.c (emacs_readlinkat, Finsert_file_contents): + * w32fns.c, xfns.c (x_create_tip_frame): Use AUTO_STRING. + 2014-10-03 Paul Eggert Fix x-focus-frame bug with "Not an in-range integer" (Bug#18586). diff --git a/src/fileio.c b/src/fileio.c index d73d2303711..4ba1c5914e8 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -2691,7 +2691,10 @@ emacs_readlinkat (int fd, char const *filename) val = build_unibyte_string (buf); if (buf[0] == '/' && strchr (buf, ':')) - val = concat2 (build_unibyte_string ("/:"), val); + { + AUTO_STRING (slash_colon, "/:"); + val = concat2 (slash_colon, val); + } if (buf != readlink_buf) xfree (buf); val = DECODE_FILE (val); @@ -3645,13 +3648,14 @@ by calling `format-decode', which see. */) report_file_error ("Read error", orig_filename); else if (nread > 0) { + AUTO_STRING (name, " *code-converting-work*"); struct buffer *prev = current_buffer; Lisp_Object workbuf; struct buffer *buf; record_unwind_current_buffer (); - workbuf = Fget_buffer_create (build_string (" *code-converting-work*")); + workbuf = Fget_buffer_create (name); buf = XBUFFER (workbuf); delete_all_overlays (buf); diff --git a/src/w32fns.c b/src/w32fns.c index 98eb8e9f97b..e61a438622f 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -5653,7 +5653,8 @@ x_create_tip_frame (struct w32_display_info *dpyinfo, f->wants_modeline = 0; XSETFRAME (frame, f); - buffer = Fget_buffer_create (build_string (" *tip*")); + AUTO_STRING (tip, " *tip*"); + buffer = Fget_buffer_create (tip); /* Use set_window_buffer instead of Fset_window_buffer (see discussion of bug#11984, bug#12025, bug#12026). */ set_window_buffer (FRAME_ROOT_WINDOW (f), buffer, 0, 0); diff --git a/src/xfns.c b/src/xfns.c index 81d7bac858b..7fd6d9070b2 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -4829,7 +4829,8 @@ x_create_tip_frame (struct x_display_info *dpyinfo, f = make_frame (1); XSETFRAME (frame, f); - buffer = Fget_buffer_create (build_string (" *tip*")); + AUTO_STRING (tip, " *tip*"); + buffer = Fget_buffer_create (tip); /* Use set_window_buffer instead of Fset_window_buffer (see discussion of bug#11984, bug#12025, bug#12026). */ set_window_buffer (FRAME_ROOT_WINDOW (f), buffer, 0, 0); -- 2.39.5