[Emacs-diffs] /srv/bzr/emacs/trunk r108106: * intervals.c (adjust_intervals_for_insertion): Initialize `newi'

[Stefan Monnier]

------------------------------------------------------------
revno: 108106
author: Dmitry Antipov <address@hidden>
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Wed 2012-05-02 13:21:54 -0400
message:
  * intervals.c (adjust_intervals_for_insertion): Initialize `newi'
  with RESET_INTERVAL.
  * buffer.c (Fget_buffer_create, Fmake_indirect_buffer):
  Remove duplicated buffer name initialization.
modified:
  src/ChangeLog
  src/buffer.c
  src/intervals.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-05-02 10:20:35 +0000
+++ b/src/ChangeLog     2012-05-02 17:21:54 +0000
@@ -1,3 +1,11 @@
+2012-05-02  Dmitry Antipov  <address@hidden>
+
+       * 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  <address@hidden>
 
        * xterm.c (x_term_init): Use memcpy instead of strncpy (Bug#11373).

=== modified file 'src/buffer.c'
--- a/src/buffer.c      2012-04-28 22:17:27 +0000
+++ b/src/buffer.c      2012-05-02 17:21:54 +0000
@@ -392,7 +392,6 @@
 
   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 @@
   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);

=== modified file 'src/intervals.c'
--- a/src/intervals.c   2012-01-19 07:21:25 +0000
+++ b/src/intervals.c   2012-05-02 17:21:54 +0000
@@ -1000,6 +1000,7 @@
          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);