Commit 0c16dfed authored by Dmitry Antipov's avatar Dmitry Antipov Committed by Stefan Monnier

* intervals.c (adjust_intervals_for_insertion): Initialize `newi'

with RESET_INTERVAL.
* buffer.c (Fget_buffer_create, Fmake_indirect_buffer):
Remove duplicated buffer name initialization.
parent 3c30e766
2012-05-02 Dmitry Antipov <dmantipov@yandex.ru>
* intervals.c (adjust_intervals_for_insertion): Initialize `newi'
with RESET_INTERVAL.
* buffer.c (Fget_buffer_create, Fmake_indirect_buffer):
Remove duplicated buffer name initialization.
2012-05-02 Jim Meyering <jim@meyering.net> 2012-05-02 Jim Meyering <jim@meyering.net>
* xterm.c (x_term_init): Use memcpy instead of strncpy (Bug#11373). * xterm.c (x_term_init): Use memcpy instead of strncpy (Bug#11373).
......
...@@ -392,7 +392,6 @@ even if it is dead. The return value is never nil. */) ...@@ -392,7 +392,6 @@ even if it is dead. The return value is never nil. */)
BVAR (b, mark) = Fmake_marker (); BVAR (b, mark) = Fmake_marker ();
BUF_MARKERS (b) = NULL; BUF_MARKERS (b) = NULL;
BVAR (b, name) = name;
/* Put this in the alist of all live buffers. */ /* Put this in the alist of all live buffers. */
XSETBUFFER (buffer, b); XSETBUFFER (buffer, b);
...@@ -612,7 +611,6 @@ CLONE nil means the indirect buffer's state is reset to default values. */) ...@@ -612,7 +611,6 @@ CLONE nil means the indirect buffer's state is reset to default values. */)
Vbuffer_alist = nconc2 (Vbuffer_alist, Fcons (Fcons (name, buf), Qnil)); Vbuffer_alist = nconc2 (Vbuffer_alist, Fcons (Fcons (name, buf), Qnil));
BVAR (b, mark) = Fmake_marker (); BVAR (b, mark) = Fmake_marker ();
BVAR (b, name) = name;
/* The multibyte status belongs to the base buffer. */ /* The multibyte status belongs to the base buffer. */
BVAR (b, enable_multibyte_characters) = BVAR (b->base_buffer, enable_multibyte_characters); BVAR (b, enable_multibyte_characters) = BVAR (b->base_buffer, enable_multibyte_characters);
......
...@@ -1000,6 +1000,7 @@ adjust_intervals_for_insertion (INTERVAL tree, ...@@ -1000,6 +1000,7 @@ adjust_intervals_for_insertion (INTERVAL tree,
Lisp_Object pleft, pright; Lisp_Object pleft, pright;
struct interval newi; struct interval newi;
RESET_INTERVAL (&newi);
pleft = NULL_INTERVAL_P (prev) ? Qnil : prev->plist; pleft = NULL_INTERVAL_P (prev) ? Qnil : prev->plist;
pright = NULL_INTERVAL_P (i) ? Qnil : i->plist; pright = NULL_INTERVAL_P (i) ? Qnil : i->plist;
newi.plist = merge_properties_sticky (pleft, pright); newi.plist = merge_properties_sticky (pleft, pright);
......
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