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

with RESET_INTERVAL.
* buffer.c (Fget_buffer_create, Fmake_indirect_buffer):
Remove duplicated buffer name initialization.

diff --git a/src/ChangeLog b/src/ChangeLog
index d621dcc8859ad6f6f692c6128fa3c48ece66d4f9..01e137d2fcca9695072c4c9cad863c361a58226a 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+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>
 
        * xterm.c (x_term_init): Use memcpy instead of strncpy (Bug#11373).

diff --git a/src/buffer.c b/src/buffer.c
index 9bac3ec742b53f8af44eb44ae0729480d684e396..2ddbc699481b3ace3848a116c0d025ae7379a959 100644 (file)
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -392,7 +392,6 @@ even if it is dead.  The return value is never nil.  */)
 
   BVAR (b, mark) = Fmake_marker ();
   BUF_MARKERS (b) = NULL;
-  BVAR (b, name) = name;
 
   /* Put this in the alist of all live buffers.  */
   XSETBUFFER (buffer, b);
@@ -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));
 
   BVAR (b, mark) = Fmake_marker ();
-  BVAR (b, name) = name;
 
   /* The multibyte status belongs to the base buffer.  */
   BVAR (b, enable_multibyte_characters) = BVAR (b->base_buffer, enable_multibyte_characters);

diff --git a/src/intervals.c b/src/intervals.c
index 88f47f58b5233cd8186addbba75c90fdc0ad84db..a750ccd13f787dcd4bb08dd582045eb7ba1ab8ea 100644 (file)
--- a/src/intervals.c
+++ b/src/intervals.c
@@ -1000,6 +1000,7 @@ adjust_intervals_for_insertion (INTERVAL tree,
          Lisp_Object pleft, pright;
          struct interval newi;
 
+         RESET_INTERVAL (&newi);
          pleft = NULL_INTERVAL_P (prev) ? Qnil : prev->plist;
          pright = NULL_INTERVAL_P (i) ? Qnil : i->plist;
          newi.plist = merge_properties_sticky (pleft, pright);