mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-26 15:21:51 -08:00
Catch-up merge from masters sources @186519 to branch/2014-04-17/describe.
Copied from Perforce Change: 186526 ServerID: perforce.ravenbrook.com
This commit is contained in:
commit
cb629746ea
321 changed files with 15540 additions and 5134 deletions
|
|
@ -199,8 +199,6 @@ static Res BufferInit(Buffer buffer, BufferClass class,
|
|||
AVER(buffer != NULL);
|
||||
AVERT(BufferClass, class);
|
||||
AVERT(Pool, pool);
|
||||
/* The PoolClass should support buffer protocols */
|
||||
AVER(PoolHasAttr(pool, AttrBUF));
|
||||
|
||||
arena = PoolArena(pool);
|
||||
/* Initialize the buffer. See <code/mpmst.h> for a definition of */
|
||||
|
|
@ -377,8 +375,6 @@ void BufferFinish(Buffer buffer)
|
|||
|
||||
pool = BufferPool(buffer);
|
||||
|
||||
/* The PoolClass should support buffer protocols */
|
||||
AVER(PoolHasAttr(pool, AttrBUF));
|
||||
AVER(BufferIsReady(buffer));
|
||||
|
||||
/* <design/alloc-frame/#lw-frame.sync.trip> */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue