[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r118023: * fileio.c (emacs_readlinkat, Finsert_file_
From: |
Dmitry Antipov |
Subject: |
[Emacs-diffs] trunk r118023: * fileio.c (emacs_readlinkat, Finsert_file_contents): |
Date: |
Fri, 03 Oct 2014 05:31:45 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 118023
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Fri 2014-10-03 09:31:17 +0400
message:
* fileio.c (emacs_readlinkat, Finsert_file_contents):
* w32fns.c, xfns.c (x_create_tip_frame): Use AUTO_STRING.
modified:
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/fileio.c fileio.c-20091113204419-o5vbwnq5f7feedwu-210
src/w32fns.c w32fns.c-20091113204419-o5vbwnq5f7feedwu-945
src/xfns.c xfns.c-20091113204419-o5vbwnq5f7feedwu-274
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2014-10-03 04:35:10 +0000
+++ b/src/ChangeLog 2014-10-03 05:31:17 +0000
@@ -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 <address@hidden>
Fix x-focus-frame bug with "Not an in-range integer" (Bug#18586).
=== modified file 'src/fileio.c'
--- a/src/fileio.c 2014-10-01 03:28:16 +0000
+++ b/src/fileio.c 2014-10-03 05:31:17 +0000
@@ -2691,7 +2691,10 @@
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 @@
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);
=== modified file 'src/w32fns.c'
--- a/src/w32fns.c 2014-09-30 23:19:31 +0000
+++ b/src/w32fns.c 2014-10-03 05:31:17 +0000
@@ -5653,7 +5653,8 @@
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);
=== modified file 'src/xfns.c'
--- a/src/xfns.c 2014-10-01 03:28:16 +0000
+++ b/src/xfns.c 2014-10-03 05:31:17 +0000
@@ -4829,7 +4829,8 @@
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);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r118023: * fileio.c (emacs_readlinkat, Finsert_file_contents):,
Dmitry Antipov <=