Commit 955d5d04 authored by Dmitry Antipov's avatar Dmitry Antipov
Browse files

* fileio.c (emacs_readlinkat, Finsert_file_contents):

* w32fns.c, xfns.c (x_create_tip_frame): Use AUTO_STRING.
parent 6846b003
......@@ -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 <eggert@cs.ucla.edu>
 
Fix x-focus-frame bug with "Not an in-range integer" (Bug#18586).
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment