diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2012-05-02 13:21:54 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-05-02 13:21:54 -0400 |
| commit | 0c16dfed7078493adb0efd587fd3762b4642b712 (patch) | |
| tree | 3913881d673ae6bb1940105a97ba8903d186a39d | |
| parent | 3c30e76668068bad00494c16a742cd9a5cb609fe (diff) | |
| download | emacs-0c16dfed7078493adb0efd587fd3762b4642b712.tar.gz emacs-0c16dfed7078493adb0efd587fd3762b4642b712.tar.bz2 emacs-0c16dfed7078493adb0efd587fd3762b4642b712.zip | |
* intervals.c (adjust_intervals_for_insertion): Initialize `newi'
with RESET_INTERVAL.
* buffer.c (Fget_buffer_create, Fmake_indirect_buffer):
Remove duplicated buffer name initialization.
| -rw-r--r-- | src/ChangeLog | 8 | ||||
| -rw-r--r-- | src/buffer.c | 2 | ||||
| -rw-r--r-- | src/intervals.c | 1 |
3 files changed, 9 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index d621dcc8859..01e137d2fcc 100644 --- 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 9bac3ec742b..2ddbc699481 100644 --- 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 88f47f58b52..a750ccd13f7 100644 --- 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); |