aboutsummaryrefslogtreecommitdiffstats
path: root/src/fileio.c
diff options
context:
space:
mode:
authorDmitry Antipov2014-10-03 09:31:17 +0400
committerDmitry Antipov2014-10-03 09:31:17 +0400
commit955d5d047d1e15546bd9c548c0b966cb73300144 (patch)
tree89c22d691846adc3da36c4cd1ccfd2a46a42e901 /src/fileio.c
parent6846b0036a0ff938d93c2d4df0f177dab3e06623 (diff)
downloademacs-955d5d047d1e15546bd9c548c0b966cb73300144.tar.gz
emacs-955d5d047d1e15546bd9c548c0b966cb73300144.zip
* fileio.c (emacs_readlinkat, Finsert_file_contents):
* w32fns.c, xfns.c (x_create_tip_frame): Use AUTO_STRING.
Diffstat (limited to 'src/fileio.c')
-rw-r--r--src/fileio.c8
1 files changed, 6 insertions, 2 deletions
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)
2691 2691
2692 val = build_unibyte_string (buf); 2692 val = build_unibyte_string (buf);
2693 if (buf[0] == '/' && strchr (buf, ':')) 2693 if (buf[0] == '/' && strchr (buf, ':'))
2694 val = concat2 (build_unibyte_string ("/:"), val); 2694 {
2695 AUTO_STRING (slash_colon, "/:");
2696 val = concat2 (slash_colon, val);
2697 }
2695 if (buf != readlink_buf) 2698 if (buf != readlink_buf)
2696 xfree (buf); 2699 xfree (buf);
2697 val = DECODE_FILE (val); 2700 val = DECODE_FILE (val);
@@ -3645,13 +3648,14 @@ by calling `format-decode', which see. */)
3645 report_file_error ("Read error", orig_filename); 3648 report_file_error ("Read error", orig_filename);
3646 else if (nread > 0) 3649 else if (nread > 0)
3647 { 3650 {
3651 AUTO_STRING (name, " *code-converting-work*");
3648 struct buffer *prev = current_buffer; 3652 struct buffer *prev = current_buffer;
3649 Lisp_Object workbuf; 3653 Lisp_Object workbuf;
3650 struct buffer *buf; 3654 struct buffer *buf;
3651 3655
3652 record_unwind_current_buffer (); 3656 record_unwind_current_buffer ();
3653 3657
3654 workbuf = Fget_buffer_create (build_string (" *code-converting-work*")); 3658 workbuf = Fget_buffer_create (name);
3655 buf = XBUFFER (workbuf); 3659 buf = XBUFFER (workbuf);
3656 3660
3657 delete_all_overlays (buf); 3661 delete_all_overlays (buf);